https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f50d58b36701d8fd1770c1241ad1e8c28ed67b01
commit f50d58b36701d8fd1770c1241ad1e8c28ed67b01 Author: Foxlet <[email protected]> AuthorDate: Mon Apr 8 18:04:54 2019 -0400 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Tue Apr 9 02:00:41 2019 +0200 [THEMES] Mizu Bitmap Updates. CORE-15936 (#1490) - Add compatibility with XP and fix some bugs with its rendering engine. - New Help and Slider bitmaps. Co-authored-by: Stanislav Motylkov <[email protected]> --- .../mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.bmp | Bin 18954 -> 14166 bytes .../mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.xcf | Bin 5687 -> 5671 bytes .../mizu.msstyles/bitmaps/NORMAL_FRAMECAPTION.bmp | Bin 53882 -> 53814 bytes .../bitmaps/NORMAL_FRAMECAPTIONMIN.bmp | Bin 38330 -> 28742 bytes .../mizu.msstyles/bitmaps/NORMAL_HELPBUTTON.bmp | Bin 3578 -> 7350 bytes .../mizu.msstyles/bitmaps/NORMAL_MAXBUTTON.bmp | Bin 9866 -> 7350 bytes .../mizu.msstyles/bitmaps/NORMAL_MINBUTTON.bmp | Bin 9866 -> 7350 bytes .../bitmaps/NORMAL_NORMALGROUPBACKGROUND.bmp | Bin 3482 -> 3414 bytes .../mizu.msstyles/bitmaps/NORMAL_PROGRESSCHUNK.bmp | Bin 3862 -> 2866 bytes .../mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp | Bin 9866 -> 7350 bytes .../mizu.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp | Bin 14538 -> 11574 bytes .../bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp | Bin 4218 -> 3174 bytes .../bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp | Bin 1018 -> 950 bytes .../bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp | Bin 4202 -> 4134 bytes .../bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp | Bin 4346 -> 4278 bytes .../mizu.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp | Bin 134 -> 134 bytes .../bitmaps/NORMAL_SLIDERTRACKVERT.bmp | Bin 134 -> 134 bytes .../themes/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp | Bin 5162 -> 5094 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp | Bin 5162 -> 5094 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp | Bin 5162 -> 5094 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp | Bin 5162 -> 5094 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp | Bin 5162 -> 5094 bytes .../mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp | Bin 5162 -> 5094 bytes .../mizu.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp | Bin 7034 -> 6966 bytes .../bitmaps/NORMAL_TASKBANDBUTTON-Darker.bmp | Bin 11642 -> 11574 bytes .../mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON.bmp | Bin 11642 -> 11574 bytes .../mizu.msstyles/textfiles/ExtraLargeNormal.INI | 11 ++++++----- .../mizu.msstyles/textfiles/LargeFontsNormal.INI | 11 ++++++----- .../themes/mizu.msstyles/textfiles/NormalNormal.INI | 5 +++-- 29 files changed, 15 insertions(+), 12 deletions(-) diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.bmp index fe418402f2c..f63f14ca622 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.xcf b/media/themes/mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.xcf index da4e5810018..1f46ed4e336 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.xcf and b/media/themes/mizu.msstyles/bitmaps/NORMAL_CLOSEBUTTON.xcf differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_FRAMECAPTION.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_FRAMECAPTION.bmp index cb267314bf8..3a70c315a00 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_FRAMECAPTION.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_FRAMECAPTION.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_FRAMECAPTIONMIN.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_FRAMECAPTIONMIN.bmp index 1746ba4dca8..73ab855a05d 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_FRAMECAPTIONMIN.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_FRAMECAPTIONMIN.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_HELPBUTTON.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_HELPBUTTON.bmp index 346880eb3e4..332ce4011f8 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_HELPBUTTON.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_HELPBUTTON.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_MAXBUTTON.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_MAXBUTTON.bmp index e367b59c074..f1e877335d9 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_MAXBUTTON.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_MAXBUTTON.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_MINBUTTON.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_MINBUTTON.bmp index 0dfd4857689..3b2f466b205 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_MINBUTTON.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_MINBUTTON.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_NORMALGROUPBACKGROUND.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_NORMALGROUPBACKGROUND.bmp index 4c6e58a0dcf..c3082d8c488 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_NORMALGROUPBACKGROUND.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_NORMALGROUPBACKGROUND.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_PROGRESSCHUNK.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_PROGRESSCHUNK.bmp index b26f1d88a22..02514d0321a 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_PROGRESSCHUNK.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_PROGRESSCHUNK.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp index e367b59c074..f1e877335d9 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp index fed2f9c30f4..db7f7f96e53 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp index 682f43cbebd..7704ab03eca 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp index 92070dfaf79..812687622b8 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp index 116f4e70d9e..111b8a385d5 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp index 0b0c9f2ef57..bdec93270b6 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp index d7427fe8202..d6d5d6f1cef 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp index d7427fe8202..d6d5d6f1cef 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp index 336b00eed53..9e039c70b4c 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEM.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp index ccbe08a6bb2..9fe7a5f77f2 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp index e1a44cdf5e6..4fa99935b35 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp index fede7c29515..f7b4a015466 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp index dde9b485290..4a6d4049298 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp index fd924291442..b038a795a8d 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp index 78fa017f36b..07f9eb101b5 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON-Darker.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON-Darker.bmp index 3c36b4764cd..a79ef47cc44 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON-Darker.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON-Darker.bmp differ diff --git a/media/themes/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON.bmp b/media/themes/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON.bmp index 4d9fa9293ec..b9c1c34909f 100644 Binary files a/media/themes/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON.bmp and b/media/themes/mizu.msstyles/bitmaps/NORMAL_TASKBANDBUTTON.bmp differ diff --git a/media/themes/mizu.msstyles/textfiles/ExtraLargeNormal.INI b/media/themes/mizu.msstyles/textfiles/ExtraLargeNormal.INI index 96ce5cf3e9b..af4b129ca02 100644 --- a/media/themes/mizu.msstyles/textfiles/ExtraLargeNormal.INI +++ b/media/themes/mizu.msstyles/textfiles/ExtraLargeNormal.INI @@ -1301,7 +1301,7 @@ BorderColorHint = 157 156 153 FillColorHint = 242 241 233 Imagecount = 1 ImageFile = Normal\SliderTrack.bmp -SizingMargins = 3, 3, 2, 2 +SizingMargins = 2, 2, 2, 2 Sizingtype = stretch [TrackBar.TrackVert] @@ -1310,7 +1310,7 @@ BorderColorHint = 157 156 153 FillColorHint = 242 241 233 Imagecount = 1 ImageFile = Normal\SliderTrackVert.bmp -SizingMargins = 2, 2, 3, 3 +SizingMargins = 2, 2, 2, 2 Sizingtype = stretch [TreeView] @@ -1346,15 +1346,16 @@ Transparent = True [Window.Caption(Active)] TextColor = 0 0 0 +TextShadowType = None [Window.Caption(Disabled)] IconEffect = Glow -TextShadowType = Continuous +TextShadowType = None TEXTCOLOR = 235 235 235 [Window.Caption(Inactive)] IconEffect = Alpha -TextShadowType = Continuous +TextShadowType = None [Window.CaptionSizingTemplate] ContentMargins = 18, 18, 26, 0 @@ -1385,7 +1386,7 @@ ImageSelectType = size MinDpi1 = 96 MinDpi2 = 126 MinDpi3 = 170 -Offset = 40, 4 +Offset = 25, 5 OffsetType = TopRight SizingMargins = 2, 2, 2, 2 SizingType = Stretch diff --git a/media/themes/mizu.msstyles/textfiles/LargeFontsNormal.INI b/media/themes/mizu.msstyles/textfiles/LargeFontsNormal.INI index 96ce5cf3e9b..af4b129ca02 100644 --- a/media/themes/mizu.msstyles/textfiles/LargeFontsNormal.INI +++ b/media/themes/mizu.msstyles/textfiles/LargeFontsNormal.INI @@ -1301,7 +1301,7 @@ BorderColorHint = 157 156 153 FillColorHint = 242 241 233 Imagecount = 1 ImageFile = Normal\SliderTrack.bmp -SizingMargins = 3, 3, 2, 2 +SizingMargins = 2, 2, 2, 2 Sizingtype = stretch [TrackBar.TrackVert] @@ -1310,7 +1310,7 @@ BorderColorHint = 157 156 153 FillColorHint = 242 241 233 Imagecount = 1 ImageFile = Normal\SliderTrackVert.bmp -SizingMargins = 2, 2, 3, 3 +SizingMargins = 2, 2, 2, 2 Sizingtype = stretch [TreeView] @@ -1346,15 +1346,16 @@ Transparent = True [Window.Caption(Active)] TextColor = 0 0 0 +TextShadowType = None [Window.Caption(Disabled)] IconEffect = Glow -TextShadowType = Continuous +TextShadowType = None TEXTCOLOR = 235 235 235 [Window.Caption(Inactive)] IconEffect = Alpha -TextShadowType = Continuous +TextShadowType = None [Window.CaptionSizingTemplate] ContentMargins = 18, 18, 26, 0 @@ -1385,7 +1386,7 @@ ImageSelectType = size MinDpi1 = 96 MinDpi2 = 126 MinDpi3 = 170 -Offset = 40, 4 +Offset = 25, 5 OffsetType = TopRight SizingMargins = 2, 2, 2, 2 SizingType = Stretch diff --git a/media/themes/mizu.msstyles/textfiles/NormalNormal.INI b/media/themes/mizu.msstyles/textfiles/NormalNormal.INI index 912e60d4562..af4b129ca02 100644 --- a/media/themes/mizu.msstyles/textfiles/NormalNormal.INI +++ b/media/themes/mizu.msstyles/textfiles/NormalNormal.INI @@ -1346,15 +1346,16 @@ Transparent = True [Window.Caption(Active)] TextColor = 0 0 0 +TextShadowType = None [Window.Caption(Disabled)] IconEffect = Glow -TextShadowType = Continuous +TextShadowType = None TEXTCOLOR = 235 235 235 [Window.Caption(Inactive)] IconEffect = Alpha -TextShadowType = Continuous +TextShadowType = None [Window.CaptionSizingTemplate] ContentMargins = 18, 18, 26, 0
