From 7f021debdc19ac5b8375d52672fe97f314123a20 Mon Sep 17 00:00:00 2001
From: Ethan Rodensky <splitwirez@gmail.com>
Date: Sat, 30 Sep 2023 16:42:55 -0400
Subject: [PATCH] [THEMES][MIZU] Add support for themed Show Desktop button
 (#5744)

Also double-check button sizing and visual padding.

Addendum to df4eb08b031. CORE-15369
---
 .../bitmaps/NORMAL_SHOWDESKTOP.bmp            | Bin 0 -> 1782 bytes
 .../bitmaps/NORMAL_SHOWDESKTOPVERTICAL.bmp    | Bin 0 -> 1782 bytes
 media/themes/Mizu/mizu.msstyles/mizu.rc       |   2 ++
 .../textfiles/ExtraLargeNormal.INI            |  20 +++++++++++++++++-
 .../textfiles/LargeFontsNormal.INI            |  20 +++++++++++++++++-
 .../mizu.msstyles/textfiles/NormalNormal.INI  |  20 +++++++++++++++++-
 6 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SHOWDESKTOP.bmp
 create mode 100644 media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SHOWDESKTOPVERTICAL.bmp

diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SHOWDESKTOP.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SHOWDESKTOP.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..cf1a3177eaa47ff1022a3b2de223cce4090f288a
GIT binary patch
literal 1782
zcmZ?r{l>-s24+A~1Bf|**aL_e86<!t1H%EJybw18g9U&@jsrub2NpCc4hfdgaDayc
vFetF1g-HyU2&fWM5GXP#4hfbK7!Fty4^Xf@01FxwhXl)LIKaaJYx)5I(;MYk

literal 0
HcmV?d00001

diff --git a/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SHOWDESKTOPVERTICAL.bmp b/media/themes/Mizu/mizu.msstyles/bitmaps/NORMAL_SHOWDESKTOPVERTICAL.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..0ba789ccf87b394b64705c3468b3a0655ceb71d4
GIT binary patch
literal 1782
zcmZ?r{l>-s24+A~1BfM{m=VlkU^oDj7vhFsutFeF=|KgQ<3I&NfG!y|2Y+->F?@hV
uQ3WkbVxSxWT|&7bKodsI!5@rN3?Hf_9-txZ0aQSv=HL&;K^Q*NN<RSm@8vlF

literal 0
HcmV?d00001

diff --git a/media/themes/Mizu/mizu.msstyles/mizu.rc b/media/themes/Mizu/mizu.msstyles/mizu.rc
index d8425723ff5..db738797849 100644
--- a/media/themes/Mizu/mizu.msstyles/mizu.rc
+++ b/media/themes/Mizu/mizu.msstyles/mizu.rc
@@ -138,6 +138,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"
diff --git a/media/themes/Mizu/mizu.msstyles/textfiles/ExtraLargeNormal.INI b/media/themes/Mizu/mizu.msstyles/textfiles/ExtraLargeNormal.INI
index af4b129ca02..fadffd92164 100644
--- a/media/themes/Mizu/mizu.msstyles/textfiles/ExtraLargeNormal.INI
+++ b/media/themes/Mizu/mizu.msstyles/textfiles/ExtraLargeNormal.INI
@@ -2235,7 +2235,7 @@ ContentMargins = 29, 7, 0, 0
 FillColorHint = 13 141 234
 ImageCount = 1
 ImageFile = Normal\TaskbarTray.bmp
-SizingMargins = 1, 0, 23, 0
+SizingMargins = 18, 0, 23, 0
 SizingType = Stretch
 Transparent = True
 TransparentColor = 255 0 0
@@ -2278,3 +2278,21 @@ ImageFile = Normal\TrayChevronHorizontalOpen.bmp
 Imagelayout = vertical
 SizingType = TrueSize
 Transparent = True
+
+[ShowDesktop::Button]
+MirrorImage = True
+ImageCount = 3
+ImageFile = Normal\ShowDesktop.bmp
+SizingMargins = 2, 2, 2, 2
+BgType = ImageFile
+SizingType = Stretch
+ImageLayout = Vertical
+
+[VerticalShowDesktop::Button]
+MirrorImage = True
+ImageCount = 3
+ImageFile = Normal\ShowDesktopVertical.bmp
+SizingMargins = 2, 2, 2, 2
+BgType = ImageFile
+SizingType = Stretch
+ImageLayout = Vertical
diff --git a/media/themes/Mizu/mizu.msstyles/textfiles/LargeFontsNormal.INI b/media/themes/Mizu/mizu.msstyles/textfiles/LargeFontsNormal.INI
index af4b129ca02..fadffd92164 100644
--- a/media/themes/Mizu/mizu.msstyles/textfiles/LargeFontsNormal.INI
+++ b/media/themes/Mizu/mizu.msstyles/textfiles/LargeFontsNormal.INI
@@ -2235,7 +2235,7 @@ ContentMargins = 29, 7, 0, 0
 FillColorHint = 13 141 234
 ImageCount = 1
 ImageFile = Normal\TaskbarTray.bmp
-SizingMargins = 1, 0, 23, 0
+SizingMargins = 18, 0, 23, 0
 SizingType = Stretch
 Transparent = True
 TransparentColor = 255 0 0
@@ -2278,3 +2278,21 @@ ImageFile = Normal\TrayChevronHorizontalOpen.bmp
 Imagelayout = vertical
 SizingType = TrueSize
 Transparent = True
+
+[ShowDesktop::Button]
+MirrorImage = True
+ImageCount = 3
+ImageFile = Normal\ShowDesktop.bmp
+SizingMargins = 2, 2, 2, 2
+BgType = ImageFile
+SizingType = Stretch
+ImageLayout = Vertical
+
+[VerticalShowDesktop::Button]
+MirrorImage = True
+ImageCount = 3
+ImageFile = Normal\ShowDesktopVertical.bmp
+SizingMargins = 2, 2, 2, 2
+BgType = ImageFile
+SizingType = Stretch
+ImageLayout = Vertical
diff --git a/media/themes/Mizu/mizu.msstyles/textfiles/NormalNormal.INI b/media/themes/Mizu/mizu.msstyles/textfiles/NormalNormal.INI
index af4b129ca02..fadffd92164 100644
--- a/media/themes/Mizu/mizu.msstyles/textfiles/NormalNormal.INI
+++ b/media/themes/Mizu/mizu.msstyles/textfiles/NormalNormal.INI
@@ -2235,7 +2235,7 @@ ContentMargins = 29, 7, 0, 0
 FillColorHint = 13 141 234
 ImageCount = 1
 ImageFile = Normal\TaskbarTray.bmp
-SizingMargins = 1, 0, 23, 0
+SizingMargins = 18, 0, 23, 0
 SizingType = Stretch
 Transparent = True
 TransparentColor = 255 0 0
@@ -2278,3 +2278,21 @@ ImageFile = Normal\TrayChevronHorizontalOpen.bmp
 Imagelayout = vertical
 SizingType = TrueSize
 Transparent = True
+
+[ShowDesktop::Button]
+MirrorImage = True
+ImageCount = 3
+ImageFile = Normal\ShowDesktop.bmp
+SizingMargins = 2, 2, 2, 2
+BgType = ImageFile
+SizingType = Stretch
+ImageLayout = Vertical
+
+[VerticalShowDesktop::Button]
+MirrorImage = True
+ImageCount = 3
+ImageFile = Normal\ShowDesktopVertical.bmp
+SizingMargins = 2, 2, 2, 2
+BgType = ImageFile
+SizingType = Stretch
+ImageLayout = Vertical