[THEMES][LAUTUS] Add support for themed Show Desktop button (#5744)

- Also fix vertical taskbar layout.
- Double-check button sizing and visual padding.

Addendum to df4eb08b031. CORE-15369 CORE-11698
This commit is contained in:
Ethan Rodensky 2023-09-30 13:21:23 -04:00 committed by Stanislav Motylkov
parent 70d7009ad9
commit 3833d927e4
11 changed files with 80 additions and 24 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

View file

@ -152,6 +152,8 @@ NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLTH
NORMAL_TASKBANDSCROLLTHUMBVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp"
NORMAL_TASKBARBACKGROUNDVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBARBACKGROUNDVERTICAL.bmp"
NORMAL_TASKBARBACKGROUND_BMP BITMAP "bitmaps/NORMAL_TASKBARBACKGROUND.bmp"
NORMAL_SHOWDESKTOPVERTICAL_BMP BITMAP "bitmaps/NORMAL_SHOWDESKTOPVERTICAL.bmp"
NORMAL_SHOWDESKTOP_BMP BITMAP "bitmaps/NORMAL_SHOWDESKTOP.bmp"
NORMAL_TASKBARCHEVRONVERT_BMP BITMAP "bitmaps/NORMAL_TASKBARCHEVRONVERT.bmp"
NORMAL_TASKBARCHEVRON_BMP BITMAP "bitmaps/NORMAL_TASKBARCHEVRON.bmp"
NORMAL_TASKBARGRIPPERVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBARGRIPPERVERTICAL.bmp"

View file

@ -1019,17 +1019,15 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackground.bmp
SizingMargins = 1, 0, 23, 0
SizingMargins = 1, 0, 6, 2
SizingType = Stretch
TRANSPARENT = true
TRANSPARENTCOLOR = 255 0 255
[TaskBar.BackgroundLeft]
BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackgroundVertical.bmp
SizingMargins = 14, 3, 0, 0
SizingMargins = 6, 2, 0, 0
SizingType = Stretch
[TaskBar.BackgroundRight]
@ -1037,7 +1035,7 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackgroundVertical.bmp
SizingMargins = 14, 2, 0, 0
SizingMargins = 6, 2, 0, 0
SizingType = Stretch
[TaskBar.BackgroundTop]
@ -1045,7 +1043,7 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackground.bmp
SizingMargins = 1, 1, 15, 4
SizingMargins = 1, 0, 6, 2
SizingType = Stretch
ContentMargins = 1, 1, 1, 1
@ -1835,6 +1833,7 @@ Textshadowcolor = 69 76 16
TEXTSHADOWOFFSET = 2, 2
TextShadowType = continuous
Transparent = True
TransparentColor = 255 0 255
[StartMenu::MenuBand]
TextColor = 75 75 75
@ -2205,6 +2204,7 @@ Transparent = True
[TrayNotify::Clock]
Font = Trebuchet MS, 8
ContentMargins = 5, 4, 0, 0
TextColor = 255 255 255
[TrayNotify::Toolbar]
@ -2229,7 +2229,7 @@ ContentMargins = 29, 7, 0, 0
FillColorHint = 13 141 234
ImageCount = 1
ImageFile = Normal\TaskbarTray.bmp
SizingMargins = 1, 0, 23, 0
SizingMargins = 20, 0, 6, 2
SizingType = Stretch
Transparent = True
TransparentColor = 255 0 0
@ -2259,7 +2259,7 @@ ContentMargins = 0, 0, 19, 7
FillColorHint = 13 141 234
ImageCount = 1
ImageFile = Normal\TaskbarTrayVertical.bmp
SizingMargins = 14, 1, 5, 5
SizingMargins = 6, 2, 20, 0
SizingType = Stretch
Transparent = True
TransparentColor = 255 0 0
@ -2272,3 +2272,21 @@ ImageFile = Normal\TrayChevronHorizontalOpen.bmp
Imagelayout = vertical
SizingType = TrueSize
Transparent = True
[ShowDesktop::Button]
MirrorImage = True
ImageCount = 3
ImageFile = Normal\ShowDesktop.bmp
SizingMargins = 4, 2, 6, 2
BgType = ImageFile
SizingType = Stretch
ImageLayout = Vertical
[VerticalShowDesktop::Button]
MirrorImage = True
ImageCount = 3
ImageFile = Normal\ShowDesktopVertical.bmp
SizingMargins = 6, 2, 4, 2
BgType = ImageFile
SizingType = Stretch
ImageLayout = Vertical

View file

@ -1019,17 +1019,15 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackground.bmp
SizingMargins = 1, 0, 23, 0
SizingMargins = 1, 0, 6, 2
SizingType = Stretch
TRANSPARENT = true
TRANSPARENTCOLOR = 255 0 255
[TaskBar.BackgroundLeft]
BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackgroundVertical.bmp
SizingMargins = 14, 3, 0, 0
SizingMargins = 6, 2, 0, 0
SizingType = Stretch
[TaskBar.BackgroundRight]
@ -1037,7 +1035,7 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackgroundVertical.bmp
SizingMargins = 14, 2, 0, 0
SizingMargins = 6, 2, 0, 0
SizingType = Stretch
[TaskBar.BackgroundTop]
@ -1045,7 +1043,7 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackground.bmp
SizingMargins = 1, 1, 15, 4
SizingMargins = 1, 0, 6, 2
SizingType = Stretch
ContentMargins = 1, 1, 1, 1
@ -1835,6 +1833,7 @@ Textshadowcolor = 69 76 16
TEXTSHADOWOFFSET = 2, 2
TextShadowType = continuous
Transparent = True
TransparentColor = 255 0 255
[StartMenu::MenuBand]
TextColor = 75 75 75
@ -2205,6 +2204,7 @@ Transparent = True
[TrayNotify::Clock]
Font = Tahoma, 9
ContentMargins = 5, 4, 0, 0
TextColor = 255 255 255
[TrayNotify::Toolbar]
@ -2229,7 +2229,7 @@ ContentMargins = 29, 7, 0, 0
FillColorHint = 13 141 234
ImageCount = 1
ImageFile = Normal\TaskbarTray.bmp
SizingMargins = 1, 0, 23, 0
SizingMargins = 20, 0, 6, 2
SizingType = Stretch
Transparent = True
TransparentColor = 255 0 0
@ -2259,7 +2259,7 @@ ContentMargins = 0, 0, 19, 7
FillColorHint = 13 141 234
ImageCount = 1
ImageFile = Normal\TaskbarTrayVertical.bmp
SizingMargins = 14, 1, 5, 5
SizingMargins = 6, 2, 20, 0
SizingType = Stretch
Transparent = True
TransparentColor = 255 0 0
@ -2272,3 +2272,21 @@ ImageFile = Normal\TrayChevronHorizontalOpen.bmp
Imagelayout = vertical
SizingType = TrueSize
Transparent = True
[ShowDesktop::Button]
MirrorImage = True
ImageCount = 3
ImageFile = Normal\ShowDesktop.bmp
SizingMargins = 4, 2, 6, 2
BgType = ImageFile
SizingType = Stretch
ImageLayout = Vertical
[VerticalShowDesktop::Button]
MirrorImage = True
ImageCount = 3
ImageFile = Normal\ShowDesktopVertical.bmp
SizingMargins = 6, 2, 4, 2
BgType = ImageFile
SizingType = Stretch
ImageLayout = Vertical

View file

@ -1019,17 +1019,15 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackground.bmp
SizingMargins = 1, 0, 23, 0
SizingMargins = 1, 0, 6, 2
SizingType = Stretch
TRANSPARENT = true
TRANSPARENTCOLOR = 255 0 255
[TaskBar.BackgroundLeft]
BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackgroundVertical.bmp
SizingMargins = 14, 3, 0, 0
SizingMargins = 6, 2, 0, 0
SizingType = Stretch
[TaskBar.BackgroundRight]
@ -1037,7 +1035,7 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackgroundVertical.bmp
SizingMargins = 14, 2, 0, 0
SizingMargins = 6, 2, 0, 0
SizingType = Stretch
[TaskBar.BackgroundTop]
@ -1045,7 +1043,7 @@ BgType = ImageFile
FillColorHint = 36 94 220
ImageCount = 1
ImageFile = Normal\TaskbarBackground.bmp
SizingMargins = 1, 1, 15, 4
SizingMargins = 1, 0, 6, 2
SizingType = Stretch
ContentMargins = 1, 1, 1, 1
@ -1835,6 +1833,7 @@ Textshadowcolor = 69 76 16
TEXTSHADOWOFFSET = 2, 2
TextShadowType = continuous
Transparent = True
TransparentColor = 255 0 255
[StartMenu::MenuBand]
TextColor = 75 75 75
@ -2205,6 +2204,7 @@ Transparent = True
[TrayNotify::Clock]
Font = Tahoma, 8
ContentMargins = 5, 4, 0, 0
TextColor = 255 255 255
[TrayNotify::Toolbar]
@ -2229,7 +2229,7 @@ ContentMargins = 29, 7, 0, 0
FillColorHint = 13 141 234
ImageCount = 1
ImageFile = Normal\TaskbarTray.bmp
SizingMargins = 1, 0, 23, 0
SizingMargins = 20, 0, 6, 2
SizingType = Stretch
Transparent = True
TransparentColor = 255 0 0
@ -2259,7 +2259,7 @@ ContentMargins = 0, 0, 19, 7
FillColorHint = 13 141 234
ImageCount = 1
ImageFile = Normal\TaskbarTrayVertical.bmp
SizingMargins = 14, 1, 5, 5
SizingMargins = 6, 2, 20, 0
SizingType = Stretch
Transparent = True
TransparentColor = 255 0 0
@ -2272,3 +2272,21 @@ ImageFile = Normal\TrayChevronHorizontalOpen.bmp
Imagelayout = vertical
SizingType = TrueSize
Transparent = True
[ShowDesktop::Button]
MirrorImage = True
ImageCount = 3
ImageFile = Normal\ShowDesktop.bmp
SizingMargins = 4, 2, 6, 2
BgType = ImageFile
SizingType = Stretch
ImageLayout = Vertical
[VerticalShowDesktop::Button]
MirrorImage = True
ImageCount = 3
ImageFile = Normal\ShowDesktopVertical.bmp
SizingMargins = 6, 2, 4, 2
BgType = ImageFile
SizingType = Stretch
ImageLayout = Vertical