Zhiyi Zhang : light.msstyles: Add ComboBox parts.

Alexandre Julliard julliard at winehq.org
Thu Jun 24 16:16:44 CDT 2021


Module: wine
Branch: master
Commit: 2d148334685934d6be5114525c0eab326eb23179
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2d148334685934d6be5114525c0eab326eb23179

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Thu Jun 24 22:43:15 2021 +0800

light.msstyles: Add ComboBox parts.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/light.msstyles/Makefile.in                |   2 ++
 dlls/light.msstyles/blue_combobutton.bmp       | Bin 0 -> 6858 bytes
 dlls/light.msstyles/blue_combobutton.svg       |  18 ++++++++++++++
 dlls/light.msstyles/blue_combobutton_glyph.bmp | Bin 0 -> 1258 bytes
 dlls/light.msstyles/blue_combobutton_glyph.svg |  28 ++++++++++++++++++++++
 dlls/light.msstyles/light.rc                   |  31 +++++++++++++++++++++++++
 6 files changed, 79 insertions(+)

diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in
index a024642e201..201ed57d055 100644
--- a/dlls/light.msstyles/Makefile.in
+++ b/dlls/light.msstyles/Makefile.in
@@ -7,6 +7,8 @@ SVG_SRCS = \
 	blue_checkbox_13px.svg \
 	blue_checkbox_16px.svg \
 	blue_checkbox_25px.svg \
+	blue_combobutton.svg \
+	blue_combobutton_glyph.svg \
 	blue_commandlink.svg \
 	blue_commandlink_glyph_30px.svg \
 	blue_commandlink_glyph_45px.svg \
diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp
new file mode 100644
index 00000000000..a2b12ba3e1f
Binary files /dev/null and b/dlls/light.msstyles/blue_combobutton.bmp differ
diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg
new file mode 100644
index 00000000000..aab7ff06812
--- /dev/null
+++ b/dlls/light.msstyles/blue_combobutton.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bitmap:20-32" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g stroke-width=".26458">
+  <rect x=".39687" y=".39687" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/>
+  <rect x=".39687" y="5.9531" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/>
+  <rect x=".39687" y="11.509" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".39687" y="17.066" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/>
+ </g>
+</svg>
diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp
new file mode 100644
index 00000000000..2c0bd8a357f
Binary files /dev/null and b/dlls/light.msstyles/blue_combobutton_glyph.bmp differ
diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg
new file mode 100644
index 00000000000..0caf1c4b696
--- /dev/null
+++ b/dlls/light.msstyles/blue_combobutton_glyph.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bitmap:10-32" width="10" height="28" version="1.1" viewBox="0 0 2.6458 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g>
+  <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/>
+  <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/>
+  <path d="m0.39688 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/>
+  <path d="m2.1173 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/>
+  <g>
+   <g stroke-width=".26458">
+    <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/>
+    <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/>
+    <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/>
+    <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/>
+   </g>
+   <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/>
+   <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/>
+  </g>
+ </g>
+</svg>
diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc
index cc5b371da8c..2451ffcd4f0 100644
--- a/dlls/light.msstyles/light.rc
+++ b/dlls/light.msstyles/light.rc
@@ -294,6 +294,30 @@ BLUE_INI TEXTFILE
 "ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n"
 "MinDpi1 = 96\r\n"
 "MinDpi2 = 144\r\n"
+
+"\r\n; ComboBox\r\n"
+"[ComboBox]\r\n"
+"BgType = BorderFill\r\n"
+"BorderSize = 1\r\n"
+"FillColor = 255 255 255\r\n"
+"BorderColor = 174 174 174\r\n"
+
+"[ComboBox(Disabled)]\r\n"
+"BorderColor = 228 228 228\r\n"
+"FillColor = 231 231 231\r\n"
+
+"[ComboBox.DropDownButton]\r\n"
+"BgType = ImageFile\r\n"
+"ImageLayout = Vertical\r\n"
+"SizingType = Stretch\r\n"
+"ImageFile = blue_combobutton.bmp\r\n"
+"SizingMargins = 3, 3, 3, 3\r\n"
+"ContentMargins = 0, 0, 0, 0\r\n"
+"ImageCount = 4\r\n"
+"GlyphType = ImageGlyph\r\n"
+"GlyphImageFile = blue_combobutton_glyph.bmp\r\n"
+"GlyphTransparent = True\r\n"
+"Transparent = True\r\n"
 }
 
 /* Button */
@@ -330,6 +354,13 @@ BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp"
 /* @makedep: blue_commandlink_glyph_45px.bmp */
 BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp"
 
+/* ComboBox */
+/* @makedep: blue_combobutton.bmp */
+BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp"
+
+/* @makedep: blue_combobutton_glyph.bmp */
+BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp"
+
 /* File version */
 #define WINE_FILEDESCRIPTION_STR "Light Theme"
 #define WINE_FILENAME_STR "light.msstyles"




More information about the wine-cvs mailing list