[PATCH 4/6] light.msstyles: Add TMT_TRANSITIONDURATIONS property.
Zhiyi Zhang
zzhang at codeweavers.com
Tue Nov 2 01:27:49 CDT 2021
Set all transition duration to 100ms for different states and 0ms for the same state.
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
dlls/light.msstyles/light.rc | 193 +++++++++++++++++++++++++++++++++++
dlls/uxtheme/tests/system.c | 1 -
2 files changed, 193 insertions(+), 1 deletion(-)
diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc
index cf9271cb612..aad8aa51d09 100644
--- a/dlls/light.msstyles/light.rc
+++ b/dlls/light.msstyles/light.rc
@@ -194,6 +194,13 @@ BLUE_INI TEXTFILE
"ImageLayout = Vertical\r\n"
"TextColor = 0 0 0\r\n"
"MinSize = 10, 5\r\n"
+"TransitionDurations = 6, "
+"0, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 0\r\n"
"[Button.Pushbutton(Pressed)]\r\n"
"TextColor = 255 255 255\r\n"
@@ -227,6 +234,27 @@ BLUE_INI TEXTFILE
"MinDpi5 = 192\r\n"
"MinDpi6 = 216\r\n"
"MinDpi7 = 240\r\n"
+"TransitionDurations = 20, "
+"0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 0\r\n"
"[Button.Checkbox(Checkeddisabled)]\r\n"
"TextColor = 189 189 189\r\n"
@@ -262,6 +290,15 @@ BLUE_INI TEXTFILE
"MinDpi5 = 192\r\n"
"MinDpi6 = 216\r\n"
"MinDpi7 = 240\r\n"
+"TransitionDurations = 8, "
+"0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0\r\n"
"[Button.Radiobutton(Checkeddisabled)]\r\n"
"TextColor = 189 189 189\r\n"
@@ -292,6 +329,13 @@ BLUE_INI TEXTFILE
"Transparent = True\r\n"
"TextColor = 0 0 0\r\n"
"MinSize = 10, 5\r\n"
+"TransitionDurations = 6, "
+"0, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 0\r\n"
"[Button.Commandlink(Hot)]\r\n"
"TextColor = 48 150 250\r\n"
@@ -333,6 +377,11 @@ BLUE_INI TEXTFILE
"BorderSize = 1\r\n"
"FillColor = 255 255 255\r\n"
"BorderColor = 174 174 174\r\n"
+"TransitionDurations = 4, "
+"0, 100, 100, 100, "
+"100, 0, 100, 100, "
+"100, 100, 0, 100, "
+"100, 100, 100, 0\r\n"
"[ComboBox(Disabled)]\r\n"
"BorderColor = 228 228 228\r\n"
@@ -350,6 +399,11 @@ BLUE_INI TEXTFILE
"GlyphImageFile = blue_combobutton_glyph.bmp\r\n"
"GlyphTransparent = True\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 4, "
+"0, 100, 100, 100, "
+"100, 0, 100, 100, "
+"100, 100, 0, 100, "
+"100, 100, 100, 0\r\n"
"\r\n; Edit\r\n"
"[Edit]\r\n"
@@ -492,6 +546,14 @@ BLUE_INI TEXTFILE
"VAlign = Top\r\n"
"\r\n; Scroll Bar\r\n"
+"[ScrollBar]\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
+
"[ScrollBar.ArrowBtn]\r\n"
"BgType = ImageFile\r\n"
"SizingMargins = 5, 5, 5, 5\r\n"
@@ -601,6 +663,11 @@ BLUE_INI TEXTFILE
"GlyphType = ImageGlyph\r\n"
"GlyphImageFile = blue_spin_glyph_up.bmp\r\n"
"GlyphTransparent = True\r\n"
+"TransitionDurations = 4, "
+"0, 100, 100, 100, "
+"100, 0, 100, 100, "
+"100, 100, 0, 100, "
+"100, 100, 100, 0\r\n"
"[Spin.Down]\r\n"
"BgType = ImageFile\r\n"
@@ -613,6 +680,11 @@ BLUE_INI TEXTFILE
"GlyphType = ImageGlyph\r\n"
"GlyphImageFile = blue_spin_glyph_down.bmp\r\n"
"GlyphTransparent = True\r\n"
+"TransitionDurations = 4, "
+"0, 100, 100, 100, "
+"100, 0, 100, 100, "
+"100, 100, 0, 100, "
+"100, 100, 100, 0\r\n"
"[Spin.Uphorz]\r\n"
"BgType = ImageFile\r\n"
@@ -625,6 +697,11 @@ BLUE_INI TEXTFILE
"GlyphType = ImageGlyph\r\n"
"GlyphImageFile = blue_spin_glyph_right.bmp\r\n"
"GlyphTransparent = True\r\n"
+"TransitionDurations = 4, "
+"0, 100, 100, 100, "
+"100, 0, 100, 100, "
+"100, 100, 0, 100, "
+"100, 100, 100, 0\r\n"
"[Spin.Downhorz]\r\n"
"BgType = ImageFile\r\n"
@@ -637,6 +714,11 @@ BLUE_INI TEXTFILE
"GlyphType = ImageGlyph\r\n"
"GlyphImageFile = blue_spin_glyph_left.bmp\r\n"
"GlyphTransparent = True\r\n"
+"TransitionDurations = 4, "
+"0, 100, 100, 100, "
+"100, 0, 100, 100, "
+"100, 100, 0, 100, "
+"100, 100, 100, 0\r\n"
"\r\n; Status\r\n"
"[Status]\r\n"
@@ -703,6 +785,12 @@ BLUE_INI TEXTFILE
"ImageFile = blue_tab_item.bmp\r\n"
"ImageCount = 5\r\n"
"ImageLayout = Vertical\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
"[Tab.TabItemLeftEdge]\r\n"
"SizingMargins = 2, 2, 6, 6\r\n"
@@ -712,6 +800,12 @@ BLUE_INI TEXTFILE
"ImageCount = 5\r\n"
"ImageLayout = Vertical\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
"[Tab.TabItemRightEdge]\r\n"
"SizingMargins = 2, 2, 6, 6\r\n"
@@ -721,6 +815,12 @@ BLUE_INI TEXTFILE
"ImageCount = 5\r\n"
"ImageLayout = Vertical\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
"[Tab.TabItemBothEdge]\r\n"
"SizingMargins = 2, 2, 6, 6\r\n"
@@ -729,6 +829,12 @@ BLUE_INI TEXTFILE
"ImageFile = blue_tab_item.bmp\r\n"
"ImageCount = 5\r\n"
"ImageLayout = Vertical\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
"[Tab.TopTabItem]\r\n"
"SizingMargins = 2, 2, 6, 6\r\n"
@@ -738,6 +844,12 @@ BLUE_INI TEXTFILE
"ImageCount = 5\r\n"
"ImageLayout = Vertical\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
"[Tab.TopTabItemLeftEdge]\r\n"
"SizingMargins = 2, 2, 6, 6\r\n"
@@ -747,6 +859,12 @@ BLUE_INI TEXTFILE
"ImageCount = 5\r\n"
"ImageLayout = Vertical\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
"[Tab.TopTabItemRightEdge]\r\n"
"SizingMargins = 2, 2, 6, 6\r\n"
@@ -756,6 +874,12 @@ BLUE_INI TEXTFILE
"ImageCount = 5\r\n"
"ImageLayout = Vertical\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
"[Tab.TopTabItemBothEdge]\r\n"
"SizingMargins = 2, 2, 6, 6\r\n"
@@ -765,6 +889,12 @@ BLUE_INI TEXTFILE
"ImageCount = 5\r\n"
"ImageLayout = Vertical\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 5, "
+"0, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, "
+"100, 100, 0, 100, 100, "
+"100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 0\r\n"
"[Tab.Body]\r\n"
"BgType = ImageFile\r\n"
@@ -776,6 +906,15 @@ BLUE_INI TEXTFILE
"BorderSize = 0\r\n"
"FillColor = 244 244 244\r\n"
"TextColor = 0 0 0\r\n"
+"TransitionDurations = 8, "
+"0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0\r\n"
"[Toolbar(Pressed)]\r\n"
"TextColor = 0 0 0\r\n"
@@ -789,6 +928,15 @@ BLUE_INI TEXTFILE
"ImageCount = 6\r\n"
"SizingType = Stretch\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 8, "
+"0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0\r\n"
"[Toolbar.Separator]\r\n"
"SizingMargins = 5, 2, 2, 1\r\n"
@@ -797,6 +945,15 @@ BLUE_INI TEXTFILE
"ImageCount = 1\r\n"
"SizingType = Tile\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 8, "
+"0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0\r\n"
"[Toolbar.SeparatorVert]\r\n"
"SizingMargins = 2, 1, 5, 1\r\n"
@@ -805,6 +962,15 @@ BLUE_INI TEXTFILE
"ImageCount = 1\r\n"
"SizingType = Tile\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 8, "
+"0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0\r\n"
"[Toolbar.DropdownButton]\r\n"
"SizingMargins = 4, 4, 4, 4\r\n"
@@ -815,6 +981,15 @@ BLUE_INI TEXTFILE
"ImageCount = 6\r\n"
"SizingType = Stretch\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 8, "
+"0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0\r\n"
"[Toolbar.SplitButton]\r\n"
"SizingMargins = 3, 2, 3, 3\r\n"
@@ -824,6 +999,15 @@ BLUE_INI TEXTFILE
"ImageCount = 6\r\n"
"SizingType = Stretch\r\n"
"Transparent = True\r\n"
+"TransitionDurations = 8, "
+"0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0\r\n"
"[Toolbar.SplitButtonDropdown]\r\n"
"SizingMargins = 1, 3, 3, 3\r\n"
@@ -836,6 +1020,15 @@ BLUE_INI TEXTFILE
"GlyphType = ImageGlyph\r\n"
"GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n"
"GlyphTransparent = True\r\n"
+"TransitionDurations = 8, "
+"0, 100, 100, 100, 100, 100, 100, 100, "
+"100, 0, 100, 100, 100, 100, 100, 100, "
+"100, 100, 0, 100, 100, 100, 100, 100, "
+"100, 100, 100, 0, 100, 100, 100, 100, "
+"100, 100, 100, 100, 0, 100, 100, 100, "
+"100, 100, 100, 100, 100, 0, 100, 100, "
+"100, 100, 100, 100, 100, 100, 0, 100, "
+"100, 100, 100, 100, 100, 100, 100, 0\r\n"
"\r\n; TrackBar\r\n"
"[TrackBar]\r\n"
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index 7992911bc19..541d46deeaa 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -1293,7 +1293,6 @@ static void test_GetThemeIntList(void)
if (LOBYTE(LOWORD(GetVersion())) < 6)
ok(hr == E_PROP_ID_UNSUPPORTED, "Expected %#x, got %#x.\n", E_PROP_ID_UNSUPPORTED, hr);
else
- todo_wine
ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr);
CloseThemeData(theme);
--
2.32.0
More information about the wine-devel
mailing list