- Wine-Devel - list.winehq.org

[PATCH 6/6] light.msstyles: Add ListView parts.
by Zhiyi Zhang June 25, 2021

June 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index f0a462035a7..b7a8f538536 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -341,6 +341,13 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; ListView\r\n" +"[ListView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" -- 2.30.2

1 0

[PATCH 5/6] light.msstyles: Add Status parts.
by Zhiyi Zhang June 25, 2021

June 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 2 + .../light.msstyles/blue_status_background.bmp | Bin 0 -> 186 bytes .../light.msstyles/blue_status_background.svg | 14 +++++++ dlls/light.msstyles/blue_status_pane.bmp | Bin 0 -> 318 bytes dlls/light.msstyles/blue_status_pane.svg | 13 +++++++ dlls/light.msstyles/light.rc | 36 ++++++++++++++++++ 6 files changed, 65 insertions(+) create mode 100644 dlls/light.msstyles/blue_status_background.bmp create mode 100644 dlls/light.msstyles/blue_status_background.svg create mode 100644 dlls/light.msstyles/blue_status_pane.bmp create mode 100644 dlls/light.msstyles/blue_status_pane.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index aef2c2f66e1..c446a1c3b56 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -37,6 +37,8 @@ SVG_SRCS = \ blue_spin_glyph_left.svg \ blue_spin_glyph_right.svg \ blue_spin_glyph_up.svg \ + blue_status_background.svg \ + blue_status_pane.svg \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_buttons_split_dropdown.svg \ blue_toolbar_buttons_split.svg \ diff --git a/dlls/light.msstyles/blue_status_background.bmp b/dlls/light.msstyles/blue_status_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b56048f2f66628f7c08dbbd6e566c502a9b4b878 GIT binary patch literal 186 zcmZ?r-NgU_T|lY^h?#+y1&A3LB!DCXg8`UCC;l(a)qKoCgczmt1VF}eyue2^W;;42IO P1!2suXzX<`02BuR!v-hg literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_status_background.svg b/dlls/light.msstyles/blue_status_background.svg new file mode 100644 index 00000000000..4fc5d4fdce0 --- /dev/null +++ b/dlls/light.msstyles/blue_status_background.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-24" width="3" height="4" version="1.1" viewBox="0 0 .79375 1.0583" 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> + <rect y=".13229" width=".79375" height="3.4173e-7" fill="#aeaeae" stroke="#aeaeae" stroke-width=".26458"/> + <rect x="-1.1102e-16" y=".26457" width=".79375" height=".79375" fill="#f5f5f5"/> +</svg> diff --git a/dlls/light.msstyles/blue_status_pane.bmp b/dlls/light.msstyles/blue_status_pane.bmp new file mode 100644 index 0000000000000000000000000000000000000000..befc4807cbdd86bb652179774b0d646f8120bd73 GIT binary patch literal 318 zcmZ?rwPR!egDxOh1H{Zg%n!tj3<_ZO79blF{AXZ*Adu95C-<OYOf~pLSnx|TtXsDZ KXafWcRyF{Fgffc& literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_status_pane.svg b/dlls/light.msstyles/blue_status_pane.svg new file mode 100644 index 00000000000..9c1b197b6c6 --- /dev/null +++ b/dlls/light.msstyles/blue_status_pane.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-32" width="3" height="15" version="1.1" viewBox="0 0 .79375 3.9688" 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> + <rect x=".26458" width=".26458" height="3.7042" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c96b4dcf30f..f0a462035a7 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -532,6 +532,35 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" +"\r\n; Status\r\n" +"[Status]\r\n" +"SizingMargins = 1, 1, 2, 1\r\n" +"ImageFile = blue_status_background.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Stretch\r\n" + +"[Status.Pane]\r\n" +"SizingMargins = 0, 2, 2, 2\r\n" +"ImageFile = blue_status_pane.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Status.GripperPane]\r\n" +"BgType = None\r\n" + +"[Status.Gripper]\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as scrollbar resize box gripper \r\n" +"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"Transparent = True\r\n" +"VAlign = Bottom\r\n" + "\r\n; Toolbar\r\n" "[Toolbar]\r\n" "BgType = BorderFill\r\n" @@ -707,6 +736,13 @@ BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" /* @makedep: blue_spin_glyph_up.bmp */ BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" +/* Status */ +/* @makedep: blue_status_background.bmp */ +BLUE_STATUS_BACKGROUND_BMP BITMAP "blue_status_background.bmp" + +/* @makedep: blue_status_pane.bmp */ +BLUE_STATUS_PANE_BMP BITMAP "blue_status_pane.bmp" + /* ToolBar */ /* @makedep: blue_toolbar_buttons.bmp */ BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp" -- 2.30.2

1 0

[PATCH 4/6] light.msstyles: Add Rebar parts.
by Zhiyi Zhang June 25, 2021

June 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 4 + dlls/light.msstyles/blue_rebar_background.bmp | Bin 0 -> 438 bytes dlls/light.msstyles/blue_rebar_background.svg | 13 ++++ dlls/light.msstyles/blue_rebar_chevron.bmp | Bin 0 -> 2298 bytes dlls/light.msstyles/blue_rebar_chevron.svg | 28 +++++++ .../blue_rebar_gripper_horizontal.bmp | Bin 0 -> 378 bytes .../blue_rebar_gripper_horizontal.svg | 16 ++++ .../blue_rebar_gripper_vertical.bmp | Bin 0 -> 378 bytes .../blue_rebar_gripper_vertical.svg | 14 ++++ dlls/light.msstyles/light.rc | 72 ++++++++++++++++++ 10 files changed, 147 insertions(+) create mode 100644 dlls/light.msstyles/blue_rebar_background.bmp create mode 100644 dlls/light.msstyles/blue_rebar_background.svg create mode 100644 dlls/light.msstyles/blue_rebar_chevron.bmp create mode 100644 dlls/light.msstyles/blue_rebar_chevron.svg create mode 100644 dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_rebar_gripper_horizontal.svg create mode 100644 dlls/light.msstyles/blue_rebar_gripper_vertical.bmp create mode 100644 dlls/light.msstyles/blue_rebar_gripper_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 524c2607b18..aef2c2f66e1 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -16,6 +16,10 @@ SVG_SRCS = \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ + blue_rebar_background.svg \ + blue_rebar_chevron.svg \ + blue_rebar_gripper_horizontal.svg \ + blue_rebar_gripper_vertical.svg \ blue_scrollbar_arrow_glyphs_7px.svg \ blue_scrollbar_arrow_glyphs_9px.svg \ blue_scrollbar_arrows.svg \ diff --git a/dlls/light.msstyles/blue_rebar_background.bmp b/dlls/light.msstyles/blue_rebar_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..18a85f93f1915e3482438217a59fd1860aee8b88 GIT binary patch literal 438 zcmZ?r-NwiO23<h128fw~SQ3aC86<!t1A`7!9?XFg{}~t{2qf~~$vvnTE=44R1x?+5 Q7yuav1EXw6NT7uS09Zok8~^|S literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_rebar_background.svg b/dlls/light.msstyles/blue_rebar_background.svg new file mode 100644 index 00000000000..aca531e8bb4 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_background.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-24" width="3" height="25" version="1.1" viewBox="0 0 .79375 6.6146" 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> + <rect x="-1e-6" y="-5.5511e-17" width=".79375" height="6.6146" fill="#fff" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_chevron.bmp b/dlls/light.msstyles/blue_rebar_chevron.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4b581c5ed1da2f8ef954635ef2784c73010c6971 GIT binary patch literal 2298 zcmZ?r{l&om23<h128g+U*bImn859_pfph^>9>_!j{}~t{2qgC3$vvnTNs=fg3jtMY z*RGup#PS4`F|1m(N^ae{b^AAM+N4NLwLrTqfaYGqXC}~Y380!?8#iuL!KIEEH6Xn} zb7tc+2bcMjiVuZw28N3`Fnsm_u_iA65~BvBcc8)<Xzzm2^o%R^=qvueQgb&Neol-F zfO<9$W_854jaq7cO*2^VeTpH$^7;ErV>zJO{og0+5iFlcQTuJ0o(0fcyyf%%siqRY lrW)+}G1UlX`Am!&P?!PjnvKsKYK1GhIiuwUdWcYm4*=2{@T&j- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_rebar_chevron.svg b/dlls/light.msstyles/blue_rebar_chevron.svg new file mode 100644 index 00000000000..a6e1b707c47 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_chevron.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="54" version="1.1" viewBox="0 0 2.6458 14.288" 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"> + <path d="m1.9855 1.5795-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z" fill="#aeaeae"/> + <path d="m2.1074 1.4622-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z" fill="#aeaeae"/> + <path d="m1.9855 3.9607-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z" fill="#3096fa"/> + <path d="m2.1074 3.8435-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z" fill="#3096fa"/> + <path d="m1.9294 6.8751 7.757e-4 -1.3187 0.18651-1.14e-4 -7.75e-4 1.3187z" fill="#2979ff"/> + <path d="m2.0993 6.8784-1.3055 7.821e-4 1.1418e-4 -0.18839 1.3055-7.827e-4z" fill="#2979ff"/> + <g fill="#aeaeae"> + <path d="m1.9855 8.7232-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 8.606-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + <path d="m1.9855 11.104-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 10.987-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + <path d="m1.9855 13.486-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 13.368-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp b/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3dca037e702f49f747318e0930e52ecd41c54a41 GIT binary patch literal 378 zcmZ?rtzu*VgDxOh1H^1V%mu`Z3<?a)K>7m^V}kz-3=jm8`tRf(RE((xzX%I{X`*G< Sty}jW1kg1MlsLLOaPa}q{4${c literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg b/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg new file mode 100644 index 00000000000..faaa3d41ba4 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="10" version="1.1" viewBox="0 0 1.5875 2.6458" 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"> + <path d="m0.52917 0.52917h0.26458v1.5875h-0.26458z" fill="#aeaeae"/> + <path d="m0.79375 0.52917h0.26458v1.5875h-0.26458z" fill="#fff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp b/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4b1e85479a16a21e908bfb3cf6779a11f916c765 GIT binary patch literal 378 zcmZ?rtzu*VgDxOh1H(a)cF%m&1a3<?a)K>7m^V}kz-3=jm8`tRf(RE((xzX%I{X_92u Yty}jWgz;(8)z$qE!o;e>XBIW&0IM7qwg3PC literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_rebar_gripper_vertical.svg b/dlls/light.msstyles/blue_rebar_gripper_vertical.svg new file mode 100644 index 00000000000..0a1249e8883 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_gripper_vertical.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="6" version="1.1" viewBox="0 0 2.6458 1.5875" 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> + <path d="m1.3229 0.79375h0.52917v0.52917h-0.52917z" fill="#aeaeae" stroke-width=".26458"/> + <path d="m1.0583 0.52917h0.52917v0.52917h-0.52917z" fill="#2d2d2d" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c24df6ca17f..c96b4dcf30f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -341,6 +341,65 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Rebar\r\n" +"[Rebar]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_rebar_background.bmp\r\n" +"SizingMargins = 1, 1, 9, 2\r\n" +"Font = Tahoma, 8\r\n" +"TextColor = 0 0 0\r\n" + +"[Rebar.Band]\r\n" +"BgType = None\r\n" +"ContentMargins = 2, 0, 0, 0\r\n" + +"[Rebar.Gripper]\r\n" +"Bgtype = imagefile\r\n" +"SizingMargins = 2, 1, 4, 2\r\n" +"ContentMargins = 2, 1, 0, 0\r\n" +"ImageFile = blue_rebar_gripper_horizontal.bmp\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Rebar.GripperVert]\r\n" +"Bgtype = ImageFile\r\n" +"SizingMargins = 3, 3, 2, 1\r\n" +"ContentMargins = 1, 2, 0, 0\r\n" +"ImageFile = blue_rebar_gripper_vertical.bmp\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Rebar.Chevron]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as toolbar buttons \r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"Bgtype = ImageFile\r\n" +"Imagelayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_rebar_chevron.bmp\r\n" +"GlyphTransparent = True\r\n" +"VAlign = Top\r\n" + +"[Rebar.ChevronVert]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as toolbar buttons \r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"Bgtype = ImageFile\r\n" +"Imagelayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_rebar_chevron.bmp\r\n" +"GlyphTransparent = True\r\n" +"VAlign = Top\r\n" + "\r\n; Scroll Bar\r\n" "[ScrollBar.ArrowBtn]\r\n" "BgType = ImageFile\r\n" @@ -582,6 +641,19 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Rebar */ +/* @makedep: blue_rebar_background.bmp */ +BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp" + +/* @makedep: blue_rebar_gripper_horizontal.bmp */ +BLUE_REBAR_GRIPPER_HORIZONTAL_BMP BITMAP "blue_rebar_gripper_horizontal.bmp" + +/* @makedep: blue_rebar_gripper_vertical.bmp */ +BLUE_REBAR_GRIPPER_VERTICAL_BMP BITMAP "blue_rebar_gripper_vertical.bmp" + +/* @makedep: blue_rebar_chevron.bmp */ +BLUE_REBAR_CHEVRON_BMP BITMAP "blue_rebar_chevron.bmp" + /* Scroll Bar */ /* @makedep: blue_scrollbar_arrows.bmp */ BLUE_SCROLLBAR_ARROWS_BMP BITMAP "blue_scrollbar_arrows.bmp" -- 2.30.2

1 0

[PATCH 3/6] light.msstyles: Add Toolbar parts.
by Zhiyi Zhang June 25, 2021

June 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 +- dlls/light.msstyles/blue_toolbar_buttons.bmp | Bin 0 -> 4890 bytes dlls/light.msstyles/blue_toolbar_buttons.svg | 20 ++++ .../blue_toolbar_buttons_split.bmp | Bin 0 -> 3306 bytes .../blue_toolbar_buttons_split.svg | 18 ++++ .../blue_toolbar_buttons_split_dropdown.bmp | Bin 0 -> 2778 bytes .../blue_toolbar_buttons_split_dropdown.svg | 18 ++++ ...e_toolbar_buttons_split_dropdown_glyph.bmp | Bin 0 -> 2298 bytes ...e_toolbar_buttons_split_dropdown_glyph.svg | 28 ++++++ .../blue_toolbar_separator_horizontal.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_horizontal.svg | 13 +++ .../blue_toolbar_separator_vertical.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_vertical.svg | 13 +++ dlls/light.msstyles/light.rc | 86 ++++++++++++++++++ 14 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_toolbar_buttons.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg create mode 100644 dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_separator_horizontal.svg create mode 100644 dlls/light.msstyles/blue_toolbar_separator_vertical.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_separator_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index ad21f8683bf..524c2607b18 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -32,4 +32,10 @@ SVG_SRCS = \ blue_spin_glyph_down.svg \ blue_spin_glyph_left.svg \ blue_spin_glyph_right.svg \ - blue_spin_glyph_up.svg + blue_spin_glyph_up.svg \ + blue_toolbar_buttons_split_dropdown_glyph.svg \ + blue_toolbar_buttons_split_dropdown.svg \ + blue_toolbar_buttons_split.svg \ + blue_toolbar_buttons.svg \ + blue_toolbar_separator_horizontal.svg \ + blue_toolbar_separator_vertical.svg diff --git a/dlls/light.msstyles/blue_toolbar_buttons.bmp b/dlls/light.msstyles/blue_toolbar_buttons.bmp new file mode 100644 index 0000000000000000000000000000000000000000..820a119f1aaeb51aaeb7536b2f93b56c4002809c GIT binary patch literal 4890 zcmeHKJx{|h5DkKb6*h)8BNZKrD$yw&x-hZuR~Yyx3y6t{0ks60p8{fP)AI3mqB?eu zJEMz2>?UhfeCp+NzGp{yeTmP#lf7L}+dW>d(YMj>&^J8a+r;>=gBQcV^L~F+f!^`y znE|O7*ecYa->Ab)X98DE36~AXobubw7|suB7-M*Qk{|{AG0I;DGMitlGdP_C^qZ+( zo5yUC?{BN|n8Pp=_PEackS5DCrZsysgZEGwIGRTqCM{p=`>5IJ63xf-P9%?qbusEr z#IP;Jpaq#z9(Bh_*sh5vh}Gwd1XXx1FjpU;<oQOO|2a7aTtB6?%Z%^sFm?w1JwK?) z3XP#=gQ(a)x&DFdgq`mD98HIF#E=7X3tU)Vle>KJegAOo(CvVWWP=sNc#^lW9eiqF2H zebfT?q6Ko9d7+Oo>Wt0xQQ2Is<s$b94wK{9(a)uT&owSj$9g~q7&pULk?8934^o(1Sk YkPKTs^;=8(C_G!ZP17;p7%&<50c(a)fXasU7T literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons.svg b/dlls/light.msstyles/blue_toolbar_buttons.svg new file mode 100644 index 00000000000..7eb3130ec1c --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="132" version="1.1" viewBox="0 0 2.3812 34.925" 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-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="2.1167" height="5.5563" rx=".52917" ry=".52917" fill="#fffffe" stroke="#3096fa"/> + <g fill="#fff"> + <rect x=".13229" y="11.774" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split.bmp new file mode 100644 index 0000000000000000000000000000000000000000..61a440b6640887429ff42ca41846bad4ced6a1f5 GIT binary patch literal 3306 zcmZ?reZ|8723<h128h{!xCMwA859_pfph{?9>_!j{}~t{2qgC3$vvnTNs=fg3!19` z)td7E8_kdZuhRJg#!cqO{+DaZ{ckcq(a)qgcpKmY&y`VYo?r~QGe1Bt=F(a)1OtwSL^)# zU#STbLC_$vQE^BZ&^jDI(a)rNESAh9O1Q~wXl{0omqP(a)IC|wn9Sz7(a)sGR;{60DEqtG1 zDF17Y-SJ=3jsJl0T)Si6XBx}>nrnOF(a)0r<u{{IEWJrMsrJ(a)XGt9asz&>wkX!2kQI% zYnlN}1Wtp*M#cYw!+_(a)D0E|B@@$v^4k0<}0o%0tFkF&t>2#$B493tLrPk`bbt+*KF zj_?o|tuKJZ*>I(a)WM(Ydul*2=%9>iH+*q!=&ZZ4v}0JZ@@ZGrF84HQ6i2}*qdY&(qb L;&IgbXdwUq!W$Kv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split.svg b/dlls/light.msstyles/blue_toolbar_buttons_split.svg new file mode 100644 index 00000000000..d5fec105607 --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="132" version="1.1" viewBox="0 0 1.5875 34.925" 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 fill="#fff" stroke-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="11.774" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fb5be321f129856612422afe671867e36c0aaad0 GIT binary patch literal 2778 zcmeHIyH3ME5HtcBJ|b~RL?Q(_A{8#uP$40Hg#w7v5K*N(a)aSZXNfT;4~@d5lt9(TUe zu(wX4$WVj|S-REj?ai(WYeqNMIR83uI6AbqDEBGvDR&&#*`<21oYQe5;5g|rJv7cP zuQrBT9rrR{At)7bS05s%EYPkGaD7yuI>Jj&K}><?uHt#Kte_+~5&;C|1h=IWuXclN zZ+i~1oEqFdncy|j5Hqj_MvI$6moyloRS~QWX*Pd2F3P??l)c(Q#{OU)c?B7tj`aJJ zf}BFXMT+O4r=XX*DFGRJiR(a)Naig7jA_Wr=ZPfitaKh__84LKw3ADMgBi25?B38RhC zD0BTR%n1Y5C;!pgtxx9DpMUj9f1*F*)F<h!VqXlauJO;cPtx0#6I-yqnPK1?>BPYd literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg new file mode 100644 index 00000000000..aa5d05aef6e --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-32" width="5" height="132" version="1.1" viewBox="0 0 1.3229 34.925" 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 fill="#fff" stroke-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="11.774" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2ada751dd6b4de8e519bf382b4a2c33446231e91 GIT binary patch literal 2298 zcmeH|y-UMT6vbl|B7#d+7l)#z1(RkFT|30dMJPIF7X(52;qYchF^Pj+0tS50Higi^ zZ03Iwk`C9CYC>zO?c!kY(O>U-_nsHR<@U6G60ZxBb&KyCumKLhim)xLB3^#hv7K5Z z2p^v$NA=^=tEu8r+qI=sKZ}S7C2GnXc+{A(a)ZtenIltpUEF10I+niT_DpRRW|r-j6- z5;Os7XK9|AdpdHj)Y;j}axK}Rj(nJ&(@1Su!`*IrE?P|b9GS}V*j7E_jbtoxi|)!| zY^hI?sj}EsjL1(a)b>VE0-V^xYx^(C(a)v=jj8+rlR9s_+~3vpJPjL#t*flRFlT|eqW2t zT4DRl7%TPreGWX%`P(a)E_Mk5h*x7X`2L<9K4;c#Z2aaS4)1_3nLJmaiG8={u=894`< z+&m+vL0i~9C-aQo>+ktSTMqwy1Ah#OZ&)f{=o_}`F7ypc4d6l9Jb&jKv8Cnax#+$D ue=GqGJTTWckQadq7%+ejW_$x(a)2?QYPGxj<NLFOCSJ0RC*<TUUneB&LK{N%#` literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg new file mode 100644 index 00000000000..dd0200a5c2e --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="54" version="1.1" viewBox="0 0 2.6458 14.288" 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"> + <path d="m2.3813 1.1987-1.0503 0.91793-0.15004-0.13113 1.0503-0.91794z"/> + <path d="m0.41463 1.0583 1.0503 0.91794-0.15004 0.13113-1.0503-0.91794z"/> + <g> + <path d="m2.3813 3.58-1.0503 0.91794-0.15004-0.13113 1.0503-0.91793z" fill="#3096fa"/> + <path d="m0.41463 3.4396 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#3096fa"/> + <path d="m2.3813 5.9612-1.0503 0.91793-0.15004-0.13113 1.0503-0.91793z" fill="#2979ff"/> + <path d="m0.41463 5.8208 1.0503 0.91793-0.15004 0.13113-1.0503-0.91793z" fill="#2979ff"/> + <path d="m2.3812 8.3425-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#aeaeae"/> + <path d="m0.41463 8.2021 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#aeaeae"/> + <path d="m2.3813 10.724-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#3096fa"/> + <path d="m0.41463 10.583 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#3096fa"/> + <path d="m2.3813 13.105-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#2979ff"/> + <path d="m0.41463 12.965 1.0503 0.91794-0.15004 0.13113-1.0503-0.91794z" fill="#2979ff"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp b/dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7d05303b554e947a099d3bbe1380c1175a1e3282 GIT binary patch literal 298 zcmZ?r)na4-gDxOh1H>Fa%nHPe3<?a)KzacXV}kz-3=jm8`tRf(RE((xzX%I{X}q%Q R)~y5DjvEk?$E_2$3;+bg4e|g0 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg b/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg new file mode 100644 index 00000000000..43ad7bea4d6 --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-32" width="8" height="5" version="1.1" viewBox="0 0 2.1167 1.3229" 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> + <rect transform="rotate(90)" x=".52917" y="-1.0583" width=".52917" height=".26458" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_separator_vertical.bmp b/dlls/light.msstyles/blue_toolbar_separator_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..45abed769996520d59ead98337759e02ebf8bbe9 GIT binary patch literal 298 zcmZ?r)na4-gDxOh1H`OA%mKuV3<?a)KzacXV}kz-3=jm8`tRf(RE((xzX%I{X{yPt MTet2%2vcex08Wh!@&Et; literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_separator_vertical.svg b/dlls/light.msstyles/blue_toolbar_separator_vertical.svg new file mode 100644 index 00000000000..60b3e07b92f --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_separator_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-32" width="5" height="8" version="1.1" viewBox="0 0 1.3229 2.1167" 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> + <rect x=".52917" y=".79375" width=".52917" height=".26458" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 0f9fe2847fe..c24df6ca17f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -472,6 +472,73 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" + +"\r\n; Toolbar\r\n" +"[Toolbar]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillColor = 244 244 244\r\n" +"TextColor = 0 0 0\r\n" + +"[Toolbar(Pressed)]\r\n" +"TextColor = 0 0 0\r\n" + +"[Toolbar.Button]\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" + +"[Toolbar.Separator]\r\n" +"SizingMargins = 5, 2, 2, 1\r\n" +"ImageFile = blue_toolbar_separator_horizontal.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Toolbar.SeparatorVert]\r\n" +"SizingMargins = 2, 1, 5, 1\r\n" +"ImageFile = blue_toolbar_separator_vertical.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Toolbar.DropdownButton]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" + +"[Toolbar.SplitButton]\r\n" +"SizingMargins = 3, 2, 3, 3\r\n" +"ImageFile = blue_toolbar_buttons_split.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" + +"[Toolbar.SplitButtonDropdown]\r\n" +"SizingMargins = 1, 3, 3, 3\r\n" +"ImageFile = blue_toolbar_buttons_split_dropdown.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" +"GlyphTransparent = True\r\n" } /* Button */ @@ -568,6 +635,25 @@ BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" /* @makedep: blue_spin_glyph_up.bmp */ BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" +/* ToolBar */ +/* @makedep: blue_toolbar_buttons.bmp */ +BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp" + +/* @makedep: blue_toolbar_buttons_split.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_BMP BITMAP "blue_toolbar_buttons_split.bmp" + +/* @makedep: blue_toolbar_separator_horizontal.bmp */ +BLUE_TOOLBAR_SEPARATOR_HORIZONTAL_BMP BITMAP "blue_toolbar_separator_horizontal.bmp" + +/* @makedep: blue_toolbar_separator_vertical.bmp */ +BLUE_TOOLBAR_SEPARATOR_VERTICAL_BMP BITMAP "blue_toolbar_separator_vertical.bmp" + +/* @makedep: blue_toolbar_buttons_split_dropdown.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropdown.bmp" + +/* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 2/6] light.msstyles: Add Spin parts.
by Zhiyi Zhang June 25, 2021

June 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 11 ++- dlls/light.msstyles/blue_spin_background.bmp | Bin 0 -> 446 bytes dlls/light.msstyles/blue_spin_background.svg | 16 ++++ .../blue_spin_background_down.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_down.svg | 19 ++++ .../blue_spin_background_left.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_left.svg | 19 ++++ .../blue_spin_background_right.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_right.svg | 19 ++++ .../blue_spin_background_up.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_up.svg | 19 ++++ dlls/light.msstyles/blue_spin_glyph_down.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_down.svg | 24 +++++ dlls/light.msstyles/blue_spin_glyph_left.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_left.svg | 24 +++++ dlls/light.msstyles/blue_spin_glyph_right.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_right.svg | 24 +++++ dlls/light.msstyles/blue_spin_glyph_up.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_up.svg | 24 +++++ dlls/light.msstyles/light.rc | 84 ++++++++++++++++++ 20 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_spin_background.bmp create mode 100644 dlls/light.msstyles/blue_spin_background.svg create mode 100644 dlls/light.msstyles/blue_spin_background_down.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_down.svg create mode 100644 dlls/light.msstyles/blue_spin_background_left.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_left.svg create mode 100644 dlls/light.msstyles/blue_spin_background_right.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_right.svg create mode 100644 dlls/light.msstyles/blue_spin_background_up.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_up.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_down.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_down.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_left.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_left.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_right.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_right.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_up.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_up.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index bcfb38b319c..ad21f8683bf 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -23,4 +23,13 @@ SVG_SRCS = \ blue_scrollbar_shaft_horizontal.svg \ blue_scrollbar_shaft_vertical.svg \ blue_scrollbar_thumb_horizontal.svg \ - blue_scrollbar_thumb_vertical.svg + blue_scrollbar_thumb_vertical.svg \ + blue_spin_background_down.svg \ + blue_spin_background_left.svg \ + blue_spin_background_right.svg \ + blue_spin_background.svg \ + blue_spin_background_up.svg \ + blue_spin_glyph_down.svg \ + blue_spin_glyph_left.svg \ + blue_spin_glyph_right.svg \ + blue_spin_glyph_up.svg diff --git a/dlls/light.msstyles/blue_spin_background.bmp b/dlls/light.msstyles/blue_spin_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..083b3062dda511d970de85f6fc4d7c56071737e2 GIT binary patch literal 446 zcmZ?r-N(oP23<h128j89m>q~286<!t1A_(a)v9?XFg{}~t{2qf~~$vvnTE=44R1x?*L jY~TSlz`y`h`X3blMSx0C#r^|DhNN1|kiZrUK)(S1!w?N` literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background.svg b/dlls/light.msstyles/blue_spin_background.svg new file mode 100644 index 00000000000..a817341f6ed --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="7" version="1.1" viewBox="0 0 3.7042 1.8521" 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 fill="#fff" stroke-width=".26458"> + <rect x=".13229" y=".13229" width="1.5875" height="1.5875" stroke="#aeaeae"/> + <rect x="1.9844" y=".13229" width="1.5875" height="1.5875" stroke="#e0e0e0"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_down.bmp b/dlls/light.msstyles/blue_spin_background_down.bmp new file mode 100644 index 0000000000000000000000000000000000000000..762755aacaa123204fbab2e403c288db395882c1 GIT binary patch literal 1674 zcmeHHJ5Iwu6f_cwI09E7xS)X=rJ<ssAaDUbH5G;vq{jqEu3$yx2zCj*-ILG}DaZvj z_G5P6voRZ4qM)(F=<V*jd9%e%vAz94$I=*Jzs6d_+QnM2*0BRJ=ce4rvbdB$y}g5r za`M}A)i6>sk|YVkaH0W%mc2m`L{XG$fMCQrjL?{apk?lP9uuQ&yWaF(<P*p7ay|$U zBOT|Yo(a)YIrAACL~_lO)@)$K9OXEMDxq^nK3+)xDq4+Az9Wn_z97n$>*?Yi+^v<&3q zbR`O>me1P(a)spxD~ZvQ(^xn>^4VwU-5>2MpBJ)Rfuuk6VDll*x^d5X%P?%`n_HYGAX zKhnD$(cLW(^^ulsMGRYObmP5fHFQ4XGM|SkpJFk^Nb>Ygt33JE^8Ww-a3)Rv<e&UM EUon&;oB#j- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_down.svg b/dlls/light.msstyles/blue_spin_background_down.svg new file mode 100644 index 00000000000..6742bd1c57f --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_down.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-24" width="8" height="64" version="1.1" viewBox="0 0 2.1167 16.933" 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> + <rect y="-3e-4" width="2.1167" height="16.934" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".1325" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.3658" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.5992" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="12.832" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_left.bmp b/dlls/light.msstyles/blue_spin_background_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..673c554e9fcd84b8f8d6b51174d290cce69ac626 GIT binary patch literal 1674 zcmeH{J5Iwu5QdF};0jy;aFHg|C=C(a)25+q!JM@@y{1nIMc*A=YD9KkN3w|f#gA_cj? zjy?RlGmch{BGJ%TjAq9(-;8X{Z)rP+{SC)hAMqAv6K5Z1&DlbPNuP@<lH;&zK%Il5 ztE%(c=X!0Bh|)BTqG)6c2}=EPqA(2OI4+DKL5n#C!7u<rf|9xK`wTgvYzAMoFZ4;0 zWLX~wh?bFaWb0{*!#V3i(=n+Yd9L=mQ<_eM4^HT2m#(+9BT+r!7-J|cSGWyL-Vk2f z*Q(a)p&9Fw<W>C=^cKi^49=W177$SZv52QV*ZlRUV{hHZHMa#?<TFwcXt;_Zow3|_oG zV1_xyG-R89XZL%;Rm=WDrdkc*wS9+eOP}XTpT~th<!lV;M9<)Sp{Fel=lq`k`-gQ{ Kb$|Zp{qqCe-DFAt literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_left.svg b/dlls/light.msstyles/blue_spin_background_left.svg new file mode 100644 index 00000000000..84d342d124d --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_left.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-24" width="7" height="64" version="1.1" viewBox="0 0 1.8521 16.933" 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> + <rect x="1.7764e-15" y="-.00024286" width="1.8521" height="16.933" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_right.bmp b/dlls/light.msstyles/blue_spin_background_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..56a6281810884e67d023d98c6269e5e68ea71e61 GIT binary patch literal 1674 zcmeH{Jx;?w5QP^B!4<dy;DQEfl!l512?7`3r=}vw3DRT!uV6*y2zCj*-ILG}DaZvj z_V9LRysR8WqM-<4G`l<V=E>H6#kO|)OUgtadk<?FYa44ptzbvUoSS+lr8u=ft)0E| zdh*kAv0==zERN%W2^46F(a)Cy}1QIaI32^1Ky4kI+w2oz{hz#jyG(PZQH59qV*3qEO@ zPV)gkj110!%hQEpYw)4*ko-gHcsj3+XgtDH>z4=AU8jpxohaa89X1wa<caQzT(f`P z^~QbC3ZH%ItT}wzqQAWubRKm*^4l6O`*BPKI9HQV5uWDPo5<qvta^Wi3wjYAm(TZ9 z=E(Bt79Q4N(;~;`M}D&<y1yZ!IdaqDJ6zb&{OOJRqW$LcQ1iL7e5%P1=!9o(a)VtHBu SZUH|3?+^2w^?v^L`||}t8)QlV literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_right.svg b/dlls/light.msstyles/blue_spin_background_right.svg new file mode 100644 index 00000000000..c8ac6d2146b --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_right.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-24" width="7" height="64" version="1.1" viewBox="0 0 1.8521 16.933" 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> + <rect y="-.00024286" width="1.8521" height="16.933" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".1325" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".1325" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".1325" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".1325" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_up.bmp b/dlls/light.msstyles/blue_spin_background_up.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5c53878b300f632667e5a7d5a94891620ca37a87 GIT binary patch literal 1674 zcmeHHJ5Iwu6m%qnas;jbxS)X=rJ<ssfN%jIH5G;vq{sZPU`6H#cA4~cpM;J`K`yYd zAG7<OjoBy?4TYtQ-tNwud0Xrh+d1s7TN-`rH&|_~eXN$XfgKQ^n{p(a)1;!*;24vsEM z=db6QF-Sy7l7wM6&;UUT5eR}HilSTt1QzQUgvJ~MEpyNFm>6x-^=0oxK5-l`=7RuX z={N`VJnP~7;<E|4U2<$ycc(O)ihFxZ*V}ZpsR{%$42-cTmMwZ+WX?v(a)b>qEg8OX=k zk|>;7KJQ~v(b=lplb<~0nt2rSY35&~_q(X<wO4$+(a)kHjI<)dfHQ&c{D#0={gQzGN* zGkw?--Q5vUA8FZE#29OgZoC(*hR)}u%;%}fr<hM*NuK_Bl_%d?+*kh(XR_>{{MY~I E8&hc`oB#j- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_up.svg b/dlls/light.msstyles/blue_spin_background_up.svg new file mode 100644 index 00000000000..1ec9953a6c1 --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_up.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-24" width="8" height="64" version="1.1" viewBox="0 0 2.1167 16.933" 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> + <rect y="-3e-4" width="2.1167" height="16.934" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.6304" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.8637" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_down.bmp b/dlls/light.msstyles/blue_spin_glyph_down.bmp new file mode 100644 index 0000000000000000000000000000000000000000..d729401a67ff5df11be9af50b00bf4635237a77f GIT binary patch literal 810 zcmbu7!D_-l6h)`D&|e4yl2W=7v}r}Mchi-d{z|ugfol`7n{*wLK(^WBFY+l>vKh}r z9%NJ$bjX=E(a)7~Gd5;B_)A62)O><f4X2OiXmGS=UK?PO`C4v%s4?CbmI<jNJ{>56~O z&hy+ailQmY@~!WuY3iZZS(b&=N_^3I(a)73I=cf?0a%)FyHF8*&{yXCC4_MrhQC%p$X zgit}}Q$_D`(mUc)6R>j9yKr~T?drpCqoCPEpH|N8X5zJRP`9gbh+l~>`Ys+Faz;}} x{B|8AW?uh${jc9$^t*F1)68wa%1Q4*4Ixw(a)zUW;}bn{D#pK!Kv(z|dm=N^N6n~wkh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_down.svg b/dlls/light.msstyles/blue_spin_glyph_down.svg new file mode 100644 index 00000000000..6f0fef139fc --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_down.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="24" version="1.1" viewBox="0 0 1.8521 6.35" 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"> + <path d="m1.8521 0.40498-0.91902 0.91793-0.13129-0.13113 0.91902-0.91794z"/> + <path d="m0.13129 0.26458 0.91902 0.91793-0.13129 0.13113-0.91902-0.91794z"/> + <g> + <path d="m1.8521 1.9925-0.91902 0.91794-0.13129-0.13113 0.91902-0.91793z" fill="#3096fa"/> + <path d="m0.13129 1.8521 0.91902 0.91794-0.13129 0.13113-0.91902-0.91793z" fill="#3096fa"/> + <path d="m1.8521 3.58-0.91902 0.91793-0.13129-0.13113 0.91902-0.91793z" fill="#fff"/> + <path d="m0.13129 3.4396 0.91902 0.91793-0.13129 0.13113-0.91902-0.91793z" fill="#fff"/> + <path d="m1.8521 5.1675-0.91902 0.91794-0.13129-0.13113 0.91902-0.91794z" fill="#aeaeae"/> + <path d="m0.13129 5.0271 0.91902 0.91794-0.13129 0.13113-0.91902-0.91793z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_left.bmp b/dlls/light.msstyles/blue_spin_glyph_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a895c886808d8a97f543e7da2193fc157688c44a GIT binary patch literal 810 zcmaiwyH12a7)J3DUqZQPsEqESHrCr%+4w59KEbvM#Mn(a)ia4l)(F?f?@-3HIBvjq4P zo$SXj=bN25VfB1{V(rJ8=NmaA7v#wDEL|nXJjCcN>-VRde)aV7Dz^LsPXFkus`B$Z z{~B+}vdo1wX_}rNxM8X&3h%)53~%eYejGFXUY4cJ8H)aD-f^y(a)JN|b$@60{PocDe2 zlZhv5mo#MXG)ysj<1<*dM0mn%qKNQ>Ii?eyaF+<rZFukRqG00LecZXbFlaXMa`4=< zC{SG-Ogz8iWxI<O!gCYe*qp1j(XH_8J|7(2b?*z|Y3>o8d>fxkJXyP>A%mx3irFLM Y(XtSpFq`Q8!V~70PI$ug-3hUN0A)s-yZ`_I literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_left.svg b/dlls/light.msstyles/blue_spin_glyph_left.svg new file mode 100644 index 00000000000..334ee0b87cf --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_left.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="28" version="1.1" viewBox="0 0 1.5875 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 stroke-width=".26458"> + <path d="m1.3229 0.13141-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.39572 0.80081 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.3229 1.9835-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.39572 2.6529 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.3229 3.8356-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.39572 4.505 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.3229 5.6877-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.39572 6.3571 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_right.bmp b/dlls/light.msstyles/blue_spin_glyph_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1e5804c5bc54b956471f35a9351258b2613d56c5 GIT binary patch literal 810 zcmb7;K~94}7)Hm|cm-HAsEM1J##)RVfQ>6RUd62^=u(S`nS^vr0t5~K$LLLpbu+%v zP=&vdIN=R5-#0UP;r-=UeT^ma6P&;Vj?|g5)q2DvhEeMKvyBPw9v;P!f#CQ+pJiE` zrs-+FN|MB*tIM)H|4*0adBDBR?>j|NIAj$}+no2^er7u|&H0P=T>Cf1#2`G$Jg7l< z4s-#1$CJGS73(a)7(yZy{Mk!cW~AFtPOvswtx=IzF#tDBcA;rUm$eVzxqXwmi5Gl#dT wUF83GMz?N1vz}!7J(a)SPoRSd$D%!3+)=Rg<GcRblUP{H1lwR<2VQW`p*pDJXV`v3p{ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_right.svg b/dlls/light.msstyles/blue_spin_glyph_right.svg new file mode 100644 index 00000000000..56b68ce195a --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_right.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="28" version="1.1" viewBox="0 0 1.5875 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 stroke-width=".26458"> + <path d="m1.1938 1.049-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.3159 0.93194-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.1938 2.9011-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.3159 2.784-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.1938 4.7532-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.3159 4.6361-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.1938 6.6053-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.3159 6.4882-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_up.bmp b/dlls/light.msstyles/blue_spin_glyph_up.bmp new file mode 100644 index 0000000000000000000000000000000000000000..62c560a676d0074669f15ea439a8cc3b35390768 GIT binary patch literal 810 zcmbu5Jx;?w5QPmv;tEJe_JTVk5=SZAr=g<ZDzuz{mLyi(nA-A><kF3g;hW&#X8C5p z$V&=KVdZaU=e^z0lh==TGsmn~_7}K>D>!qMBi8#l+tJdF^ZkjV*AGw6M^`3<iwS>h z7ex`LX?i`@@;vt-Da%sf*Mm=W=^MOTxj*<>mW85MRdq9-gYR><m3d?Rl(W`41}i7M z2MH*s!T3}c8ZbGjgCG9rR!%e(a)TKIR)J__QGXkq2-HcJmZ>7qdO+n^r&ZohK-UC<nM z_a^7BznO=kcW-km=V8C{Kcht}^G^APf8NCOR!(}En}C8E2H)k}fXPW!Abtp<TRG`{ JXhG&pt}n}On{faD literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_up.svg b/dlls/light.msstyles/blue_spin_glyph_up.svg new file mode 100644 index 00000000000..6641d33cb20 --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_up.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="24" version="1.1" viewBox="0 0 1.8521 6.35" 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"> + <path d="m0.93222 0.27387 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0 1.1825 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m0.93222 1.8614 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0 2.77 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m0.93222 3.4489 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0 4.3575 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m0.93222 5.0364 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0 5.945 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c197a35960a..0f9fe2847fe 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -416,6 +416,62 @@ BLUE_INI TEXTFILE "SizingType = TrueSize\r\n" "Transparent = True\r\n" "VAlign = Bottom\r\n" + +"\r\n; Spin\r\n" +"[Spin]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_spin_background.bmp\r\n" +"SizingMargins = 2, 2, 2, 2\r\n" +"ImageCount = 1\r\n" + +"[Spin.Up]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_up.bmp\r\n" +"SizingMargins = 4, 3, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_up.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Down]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_spin_background_down.bmp\r\n" +"SizingMargins = 4, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_down.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Uphorz]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_right.bmp\r\n" +"SizingMargins = 3, 3, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_right.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Downhorz]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_left.bmp\r\n" +"SizingMargins = 4, 2, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_left.bmp\r\n" +"GlyphTransparent = True\r\n" } /* Button */ @@ -484,6 +540,34 @@ BLUE_SCROLLBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_scrollbar_thumb_horizontal.bmp" /* @makedep: blue_scrollbar_thumb_vertical.bmp */ BLUE_SCROLLBAR_THUMB_VERTICAL_BMP BITMAP "blue_scrollbar_thumb_vertical.bmp" +/* Spin */ +/* @makedep: blue_spin_background.bmp */ +BLUE_SPIN_BACKGROUND_BMP BITMAP "blue_spin_background.bmp" + +/* @makedep: blue_spin_background_down.bmp */ +BLUE_SPIN_BACKGROUND_DOWN_BMP BITMAP "blue_spin_background_down.bmp" + +/* @makedep: blue_spin_background_right.bmp */ +BLUE_SPIN_BACKGROUND_RIGHT_BMP BITMAP "blue_spin_background_right.bmp" + +/* @makedep: blue_spin_background_left.bmp */ +BLUE_SPIN_BACKGROUND_LEFT_BMP BITMAP "blue_spin_background_left.bmp" + +/* @makedep: blue_spin_background_up.bmp */ +BLUE_SPIN_BACKGROUND_UP_BMP BITMAP "blue_spin_background_up.bmp" + +/* @makedep: blue_spin_glyph_down.bmp */ +BLUE_SPIN_GLYPH_DOWN_BMP BITMAP "blue_spin_glyph_down.bmp" + +/* @makedep: blue_spin_glyph_left.bmp */ +BLUE_SPIN_GLYPH_LEFT_BMP BITMAP "blue_spin_glyph_left.bmp" + +/* @makedep: blue_spin_glyph_right.bmp */ +BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" + +/* @makedep: blue_spin_glyph_up.bmp */ +BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 1/6] light.msstyles: Add Scroll Bar parts.
by Zhiyi Zhang June 25, 2021

June 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 10 +- .../blue_scrollbar_arrow_glyphs_7px.bmp | Bin 0 -> 3274 bytes .../blue_scrollbar_arrow_glyphs_7px.svg | 54 ++++++++++ .../blue_scrollbar_arrow_glyphs_9px.bmp | Bin 0 -> 5322 bytes .../blue_scrollbar_arrow_glyphs_9px.svg | 54 ++++++++++ dlls/light.msstyles/blue_scrollbar_arrows.bmp | Bin 0 -> 14282 bytes dlls/light.msstyles/blue_scrollbar_arrows.svg | 37 +++++++ .../blue_scrollbar_resizebox_grip.bmp | Bin 0 -> 2314 bytes .../blue_scrollbar_resizebox_grip.svg | 26 +++++ .../blue_scrollbar_shaft_horizontal.bmp | Bin 0 -> 394 bytes .../blue_scrollbar_shaft_horizontal.svg | 13 +++ .../blue_scrollbar_shaft_vertical.bmp | Bin 0 -> 490 bytes .../blue_scrollbar_shaft_vertical.svg | 13 +++ .../blue_scrollbar_thumb_horizontal.bmp | Bin 0 -> 4762 bytes .../blue_scrollbar_thumb_horizontal.svg | 19 ++++ .../blue_scrollbar_thumb_vertical.bmp | Bin 0 -> 4714 bytes .../blue_scrollbar_thumb_vertical.svg | 19 ++++ dlls/light.msstyles/light.rc | 101 ++++++++++++++++++ 18 files changed, 345 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_arrows.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrows.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 201ed57d055..bcfb38b319c 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -15,4 +15,12 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ - blue_radiobutton_25px.svg + blue_radiobutton_25px.svg \ + blue_scrollbar_arrow_glyphs_7px.svg \ + blue_scrollbar_arrow_glyphs_9px.svg \ + blue_scrollbar_arrows.svg \ + blue_scrollbar_resizebox_grip.svg \ + blue_scrollbar_shaft_horizontal.svg \ + blue_scrollbar_shaft_vertical.svg \ + blue_scrollbar_thumb_horizontal.svg \ + blue_scrollbar_thumb_vertical.svg diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e8de9a21fd637883a13d7773f777d35ca74a727e GIT binary patch literal 3274 zcmcJRyKWjm7=<@Vq%^4kDO@%oO^CzARv=~MCRLg|Nu;!Sf|QPd7$l&!d(a)r$J`@8^e z0)}Suo%N2hmq8#ajC?#Z=gjQxVgLW1J^b?Lg%h-&{Qm)-gKyx8<2q02KZQEONb?=% z{!g5L`1$Mih`818*_u(a)s7Z-!`^YfBTK0Q4xqI)+tH?JO}UtV4|**{C}y}rKA!cW25 zsK)(rHePGs`|NuYU2n#|?+<|01AGy9!0KTOy~&!C2e>Slf|v*9IUBEMh3^BahgGLO zSR6O39u_ADMRafRt7`SINuM9pn#*=0?V-Py<+{^ldq3`>{UK-L<pI8b*WR~!Kpp_A z2lyiJfYrkmdXqIN4{%v91u+lIb8C2Lrw`V7a1>{XH!X}d<q7<lIDKj1J>uPs@*1;e zM*e(E@|s^=T@|>V$C}qReN+C0&oi>^Rh%i_k{VnIj6uvp$b0mzWzP)W>H)q0JYe+z zzbXGptQjTmsk!1z(a)s`vU-MR~ZJMY$F9+W(a)up7i9NWw$n4b*fem^Y&gr`|djLtsXYz zS9sr1@}A*bahCD`r#u;hn1_&8p12^{6#rHa(a)CBfKRuAx-@=wn*0$VrYFR%C}hGV%W zUU5x)x9BHlXJ_wp(XhUcO&v$eNM~JzK2_ht^@FV+=n)Hvy*yBS$2^3*N3Z%n0f7g4 z)pzAjP(SE1KzarAKsovt%(Z@}9_B~Y{EGOt*70_IygIJ7R-MLVd0e~qp!yDP>bT#n zW&-_pqoRB>yz$}Rp9eejz`gQ7(a)f~{)%yU3_(gG6(a)c%V1DspFYYuh1*s49_rVTEA-# z;jR94#C6YhUXUY0ofqg2=ZUHJXh9Aeo%~TArM|<^%gR5X+}&9V<2qKS;7VW!T<~z7 zFgEo*@DR~kj6D!L|CyJ8@^7aeR^58fdR}zv!{9t2AB=A5y*Upa^dOJY-(hzr2W6cv u>%QOq<BREWt=M~DuHS74To64^ip)J=&I6+>kHp8`19R0a<)5y%vHb-+w^!)^ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg new file mode 100644 index 00000000000..c5eed6d9d3b --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="112" version="1.1" viewBox="0 0 1.8521 29.633" 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"> + <path d="m0.93222 0.27387 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0 1.1825 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m0.93222 2.126 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0 3.0346 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m0.93222 3.978 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0 4.8867 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m0.93222 5.8301 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0 6.7388 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + <path d="m1.8591 8.0782-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z"/> + <path d="m0.14042 7.9375 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z"/> + <g> + <path d="m1.8591 9.9303-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#3096fa"/> + <path d="m0.14042 9.7896 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#3096fa"/> + <path d="m1.8591 11.782-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#fff"/> + <path d="m0.14042 11.642 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#fff"/> + <path d="m1.8591 13.634-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#aeaeae"/> + <path d="m0.14042 13.494 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#aeaeae"/> + </g> + <path d="m1.3229 14.948-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.39572 15.617 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.3229 16.8-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.39572 17.47 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.3229 18.652-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.39572 19.322 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.3229 20.504-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.39571 21.174 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + <path d="m1.4583 23.274-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.5805 23.157-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.4583 25.126-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.5805 25.009-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.4583 26.978-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.5805 26.861-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.4583 28.83-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.5805 28.713-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..da6e0a47f02d02fbaef5158f534588dd411b787e GIT binary patch literal 5322 zcmds(zit{q7{o71n)H!C3YbfrCX$1(tw74iO{z3`m9%++RFPwh3=+B8^8b>8>-_?} z3D`8`H{|wociLT_CFIDgJigtXx!q;74B!6On^(cI{p9}-(a)Dlt2&w?;`&hvA^)6KL+ z5d8bo++zRBx9=IURQE+Gm0NUvem*=oIoWV4f<QdF`1<<#%_?*k7Z+{To4D4xy1J^s zkHLGJhVxW?yxxHyu+BT%`>UQ?EEYr1(a)U08K0b=0w(a)Bz9uTBnC_6)*-?51Fs}czqW5 z0eBP-=SQvK>~P2H;p}*C16(a)4(-Sm1`RyRG^Zr^ox+#U|LD(pAD>+ae;?0&5JczFmv zxb5yfiid1B1YQr}^<9sF*TV<s+Gw2~!d1W+SUqIEdJhjB48UV~7$`TCAKKW~&d$yn z(a)FQ~QwTF+%xzNUIjx{Fa=_ePj`OC}8I{U<E-}-cA^Eo+p<XdZ1oN`0?;aU%_0Y<>; zVZz5eL(du$c&~@>br1uuhwx?dxq&uvooSWx$_?d*Yfa_lyxSU0d)rnIm%Q?_*9u*0 z-1W96^P{HM!)bS`&N<@SqYqvW%jRx!uE=$!70)X-oF2j{FO`QOu(kVmy`%i|dI(<! z+Q;i5eA#@~xgzl2n{tkvnz-sMlTS(AH!A83Z|X~Os;1mSziB=k<4E~s#(GKzj<a)5 zwNIvmKzU~UonzkQlj=U(a)W=@ykm%r<bYaj-xhx8+m^N_K0YvG}CZcd)L>MfH`bLu|j zW>IH&Q(sOGnzd!_9q*+cGLDLMYNA^U5BdItKzWwCUyMyN`J}pU1d2MtoBFbbM!A=I zNIwF(d&pS2b(a)7moVsGSFzgRaa*T5h1Mv|v#eQEL$P42hD=uS^hJIYIwpJpBNRF3lQ zMEjVzr~D+Z`XE>HFm8a<L;A|ow7#To(a)-ydQM%SSq19NY47BRmGl+SD7;k?)C7wg7l zUDj)*9xn4VQ(u~VEY^Xk?y%WWUYh*O8OY$4996wp%+I3k361-lHFpmg>wcsj(hq(a)h c(&$V+=I&ue*P$N+>pf&%IjVftJ}Ym30bpQQ0ssI2 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg new file mode 100644 index 00000000000..7f5bde5dcc8 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="144" version="1.1" viewBox="0 0 2.3812 38.1" 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"> + <path d="m1.1968 0.53845 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0.26458 1.4471 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m1.1968 2.9197 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0.26458 3.8283 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m1.1968 5.301 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0.26458 6.2096 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m1.1968 7.6822 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0.26458 8.5908 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + <path d="m2.1144 10.459-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z"/> + <path d="m0.39571 10.319 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z"/> + <g> + <path d="m2.1144 12.841-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#3096fa"/> + <path d="m0.39571 12.7 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#3096fa"/> + <path d="m2.1144 15.222-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#fff"/> + <path d="m0.39571 15.081 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#fff"/> + <path d="m2.1144 17.603-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#aeaeae"/> + <path d="m0.39571 17.462 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#aeaeae"/> + </g> + <path d="m1.5875 19.446-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.6603 20.115 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.5875 21.827-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.6603 22.497 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.5875 24.208-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.6603 24.878 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.5875 26.59-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.6603 27.259 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + <path d="m1.7229 29.889-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.845 29.772-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.7229 32.27-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.845 32.153-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.7229 34.651-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.845 34.534-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.7229 37.032-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.845 36.915-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.bmp b/dlls/light.msstyles/blue_scrollbar_arrows.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8e6ae4fe96acdcd67e7d576f6315d3680e39bcc4 GIT binary patch literal 14282 zcmeI2&2HL26oqf3JV3kaE2Pb$8`5o*O;_1e%HInl>AI_sK0)^(q>1tf5hafRt0>79 z*cY-Z6%|O>3^!*CB0r*<u@}||9m_WM_*~l>?uGMtys>%nNs{RY*59$b#qwrJWJ%s7 z?d#Ly$<A!0B9qy+=*H(S-)4tAH<n-N`u%>rUawRtSFQ;fD4`d8G(a)DIhjJhUhpoCr! z?GrFLA(YSy?#Ok47ssJz4EsQB9%RY4TCLV<wS3a_DX&ov2*cG}<#Pqiw0^YP*3zyP zSM_McF++2(a)r`?WdX-AJgIMlP#L0Q(a)ruPe-AuyMR9zE^k_#+aiO_JQpKpNxK%IM9op zY-#bmZ`Rqo-Vy!tTTix;t?n>rP&nPTjQ>5v)x+p)Eh>F<%x7!y^;hU6t{#}%a~%y| z{L9SU84b<tPlQQSE~ts-YUVVKhPWfa{meP`|0d`e!#>a?57OpaxghbceRF^5m8K># zcNeGw8TZ<8bsyR7C>~T-xqyIiuOn%_<zO&K=PetJ2EC;weurK;Kkpx;w}cC|Y{r_) zFArFA`So?kH3vSkJm=|0!E=8f5}qr1^Bk0?d+Gf(dCu}R*(_(a)x<jHeeUXM2bfFM81 zbG?q`IZr?O#B+BSzP=YcS3M-pk+UY8l^3Hg5YJgZ%CUm{JQDqAw!RM1TTaIc(()W@ zj?Y8vlVkiA1U(iSa?Npkj?A=>+?XfNr5&Fm&v8s|5m}Qwm+4&`vP{_iE#&VfWN%5H zV_t{OW?5=G<eDSTk>|*Bc=0mN_bthD<T>)(5F^yVzHiB~g7BY{XYpc-78A0!d<0o% B3bFtI literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.svg b/dlls/light.msstyles/blue_scrollbar_arrows.svg new file mode 100644 index 00000000000..352db059a9d --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrows.svg @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-24" width="17" height="272" version="1.1" viewBox="0 0 4.4979 71.967" 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> + <rect x="-1.875e-5" width="4.4979" height="71.967" fill="#fff"/> + <g stroke-width=".26458"> + <rect x=".13229" y=".13229" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="4.6302" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="9.1281" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="13.626" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="18.124" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="22.622" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="27.12" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="31.618" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="36.116" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="40.614" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="45.111" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="49.609" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="54.107" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="58.605" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="63.103" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="67.601" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6bc433536ddf5adfba071bea14e246fb9e41b33a GIT binary patch literal 2314 zcmZ?r<>F)jgDxOh1H=kIEC|GmKo&EQZr}hC7~nqx0|bF&{yVt`6=NtNAizREelSVz z-MjZc2!q^&i;YhXSr0k>Le`IqO-uX9aWk#-kmG-9x(a)Dm4r>0*hH48Z`KxU!yDK(#v XesufL`GoY3%8!P?Xb6mk04M|ikd>kI literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg new file mode 100644 index 00000000000..5c31233d422 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:32-32" width="32" height="17" version="1.1" viewBox="0 0 8.4667 4.4979" 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 fill="#bdbdbd" stroke-width="0"> + <rect x="3.4396" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.6458" y="3.7042" width=".52917" height=".52917"/> + <rect x="1.8521" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.6458" y="2.9104" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.9104" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.1167" width=".52917" height=".52917"/> + <rect x="4.4979" y="2.1167" width=".52917" height=".52917"/> + <rect x="5.2917" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.4979" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.4979" y="2.9104" width=".52917" height=".52917"/> + <rect x="5.2917" y="2.9104" width=".52917" height=".52917"/> + <rect x="6.0854" y="3.7042" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..36ba313b639d525267e9de26bbbd503fdf0a8a3c GIT binary patch literal 394 zcmZ?r?P6pAgDxOh1H?=~tN_G}3=%*R%z)4+<bMVR2m*=zcXAIZMv*3h!-A&fD;O{^ Hj8qx`Ui`mn literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg new file mode 100644 index 00000000000..9a2fd73b407 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:2-24" width="2" height="32" version="1.1" viewBox="0 0 .52917 8.4667" 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> + <rect width=".52917" height="8.4667" fill="#f5f5f5" stroke="#0091ea" stroke-dasharray="0, 2.91041999999999978" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..17cca423462277fc3594d93e4843c794bbcecf7a GIT binary patch literal 490 zcmZ?reZ|NC23<h128j89m;;Cz86<!t149B-9?XFg{}~t{2qf~~$vvnTE=44R1x?*o Sq5%T~(MrFLs)d9V0|Nk*?n(Xt literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg new file mode 100644 index 00000000000..b9408619f1b --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="8" version="1.1" viewBox="0 0 3.7042 2.1167" 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> + <rect width="3.7042" height="2.1167" fill="#f5f5f5" stroke="#0091ea" stroke-dasharray="0, 2.91042999999999985" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1107be09217240ede1d7eb5d97879ba360c66fe6 GIT binary patch literal 4762 zcmeHKK~4fO6#XV1z_>78feo_30}vBeZajga0bRQy886(a)g5XcNiFypva6IhCC*bDBQ zL^BIIl<$MlNpVGsiwSAdmUd>|Yx~;wLrX`kZJMVW)DFrH$^ps-?V={y`guR^q!kk- zdG>@$hsRgxt0fzof4+;NsN3!OzJI5g009tiBK-FIeJLetCO`lLoCtIV1j%>+0#1Y# zXii|^bHFW!qKMT)5d+Ok>G2<a>2x}S!N9<Fif<7BK!e#p9jye&Z~WkJ$le({d9LO3 zG9c}94o3)vUYVboJQ0g~wnPt*$6JgK4$v78BxA&5zTN`|mas~y<t&G)pVdQEgK(a)kv zbUs$`3ykLEu@?7)pIauj0|5;0mBI1x#_p+M{6O3YheXrQQ5;-|Mp4uYdbv(a)IA1<d~ z??iD>l|7fGehiXAzO*nt5oTaQkQ|c9STy&+Q7<eW8oeIimP3)u>Y<2%X14TL#V=C8 zZt(4WMZUI8YzN==T-bgVKZbEoF^nHU72$`--o?^`hQE^bE|#j1vAYL0N12*-bM5wa Ho$g}aUx`De literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg new file mode 100644 index 00000000000..a94689a93ab --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-24" width="22" height="68" version="1.1" viewBox="0 0 5.8208 17.992" 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 fill="#fff" stroke-width=".26458"> + <rect x="-7.0588e-5" width="5.8209" height="17.992" fill="#fff" stroke-width=".070005"/> + <rect x=".13229" y=".13229" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#aeaeae"/> + <rect x=".13229" y="4.6302" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#3096fa"/> + <rect x=".13229" y="9.1281" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#2979ff"/> + <rect x=".13229" y="13.626" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..49c5ceb41d9425b7b6a40aad7d4f205ad7d9bc1c GIT binary patch literal 4714 zcmeHKF;2rk5L_fa02N<I6KKo>(ooS*Q9?io&{9P*AK(GtM0TDK8PfxjT(a)q@$qrjoV z5|NA8xh&%t356itnJUGt?#{Ar_V%>e8EYH+7n?M<Ypf>b2Ie8=8f{@EdM!RI855PG z*x|<B!Q~P}@?rhgewwC15V)>8kQp#Q0#A5^VJL)PnE?YN(a)C0uahw?xmfhXKZ7GPl? zc<rNez`722o`e5z&iDN&id3lj!)<5++z?GBAp>B(HH4Fxof9_e+^I<hF#S_bM#N5& zAG<uw7Fhr13osA22tY*y6^HVae8N}TRNSYMb!ys2=YUZ+x(<pQROOsmC$^9Hsi#C$ z&>1S=G>Jdn*gjU(5Qs+-)9iDUduN$tWH&pKVHx(a)T`E2}7xz`p$n}vezh)g{95P%Rt z$)VJl=_Kp!67Ew;c7WGDItQ%lfXf_I<(y?ue%BH&eI=@b+d~^#01b(AucfLXUK^T2 Zy3f+RneI!<z65!w^q*VxysdJd^#!G8L{I<# literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg new file mode 100644 index 00000000000..bd0cd89ff2c --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-24" width="17" height="88" version="1.1" viewBox="0 0 4.4979 23.283" 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> + <rect y="-.00012353" width="4.4979" height="23.283" fill="#fff" stroke-width=".26458"/> + <g fill="#fff" stroke-width=".26458"> + <rect transform="rotate(90)" x=".13229" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#aeaeae"/> + <rect transform="rotate(90)" x="5.9531" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#3096fa"/> + <rect transform="rotate(90)" x="11.774" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#2979ff"/> + <rect transform="rotate(90)" x="17.595" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cb51b8a5246..c197a35960a 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -340,6 +340,82 @@ BLUE_INI TEXTFILE "BorderSize = 1\r\n" "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" + +"\r\n; Scroll Bar\r\n" +"[ScrollBar.ArrowBtn]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 0, 0, 3, 3\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_scrollbar_arrows.bmp\r\n" +"ImageCount = 16\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphTransparent = True\r\n" +"ImageSelectType = Size\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_scrollbar_arrow_glyphs_7px.bmp\r\n" +"ImageFile2 = blue_scrollbar_arrow_glyphs_9px.bmp\r\n" +"MinSize1 = 7, 7\r\n" +"MinSize2 = 9, 9\r\n" + +"[ScrollBar.ThumbBtnHorz]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 4, 4, 0, 0\r\n" +"ImageFile = blue_scrollbar_thumb_horizontal.bmp\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.ThumbBtnVert]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 0, 0, 4, 4\r\n" +"ImageFile = blue_scrollbar_thumb_vertical.bmp\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.GripperHorz]\r\n" +"BgType = None\r\n" + +"[ScrollBar.GripperVert]\r\n" +"BgType = None\r\n" + +"[ScrollBar.LowerTrackHorz]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_horizontal.bmp\r\n" +"SizingMargins = 0, 0, 1, 1\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.LowerTrackVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_vertical.bmp\r\n" +"SizingMargins = 1, 1, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.UpperTrackHorz]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_horizontal.bmp\r\n" +"SizingMargins = 0, 0, 1, 1\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.UpperTrackVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_vertical.bmp\r\n" +"SizingMargins = 1, 1, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.SizeBox]\r\n" +"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"Transparent = True\r\n" +"VAlign = Bottom\r\n" } /* Button */ @@ -383,6 +459,31 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Scroll Bar */ +/* @makedep: blue_scrollbar_arrows.bmp */ +BLUE_SCROLLBAR_ARROWS_BMP BITMAP "blue_scrollbar_arrows.bmp" + +/* @makedep: blue_scrollbar_arrow_glyphs_7px.bmp */ +BLUE_SCROLLBAR_ARROW_GLYPHS_7PX_BMP BITMAP "blue_scrollbar_arrow_glyphs_7px.bmp" + +/* @makedep: blue_scrollbar_arrow_glyphs_9px.bmp */ +BLUE_SCROLLBAR_ARROW_GLYPHS_9PX_BMP BITMAP "blue_scrollbar_arrow_glyphs_9px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_BMP BITMAP "blue_scrollbar_resizebox_grip.bmp" + +/* @makedep: blue_scrollbar_shaft_horizontal.bmp */ +BLUE_SCROLLBAR_SHAFT_HORIZONTAL_BMP BITMAP "blue_scrollbar_shaft_horizontal.bmp" + +/* @makedep: blue_scrollbar_shaft_vertical.bmp */ +BLUE_SCROLLBAR_SHAFT_VERTICAL_BMP BITMAP "blue_scrollbar_shaft_vertical.bmp" + +/* @makedep: blue_scrollbar_thumb_horizontal.bmp */ +BLUE_SCROLLBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_scrollbar_thumb_horizontal.bmp" + +/* @makedep: blue_scrollbar_thumb_vertical.bmp */ +BLUE_SCROLLBAR_THUMB_VERTICAL_BMP BITMAP "blue_scrollbar_thumb_vertical.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[WineHQ] news: Fix some spelling issues.
by Francois Gouget June 25, 2021

June 25, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- news/en/2004012201.xml | 2 +- news/en/2017052601.xml | 2 +- news/en/2018070901.xml | 2 +- news/ko/2017052601.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[WineHQ] Fix the WineConf case.
by Francois Gouget June 25, 2021

June 25, 2021

1 0

[PATCH 1/2] ntdll: Implement RtlDefaultNpAcl
by Patrick Hibbs June 24, 2021

June 24, 2021

Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- dlls/ntdll/sec.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index eccfc82ce8c..448b0b7def6 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1721,11 +1721,178 @@ NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject( /****************************************************************************** * RtlDefaultNpAcl (NTDLL.@) + * + * Constructs a default ACL with the following entries: + * Local System: Full Control + * Administrators: Full Control + * World: Read Only + * Anonymous: Read Only + * Owner: Full Control + * + * 'Owner' is determined by the current effective + * thread token's default owner. (Or process token if + * the thread token cannot be retrieved.) + * + * Returns STATUS_SUCCESS if successful. + * Generates EXCEPTION_ACCESS_VIOLATION if pAcl is NULL. */ NTSTATUS WINAPI RtlDefaultNpAcl(PACL *pAcl) { - FIXME("%p - stub\n", pAcl); + PACL new_acl = NULL; + PSID new_sid = NULL; + DWORD acl_length = 0; + ULONG owner_sid_length = 0; + PTOKEN_OWNER owner = NULL; + HANDLE token = NULL; + SID_IDENTIFIER_AUTHORITY local_auth = {SECURITY_NT_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY world_auth = {SECURITY_WORLD_SID_AUTHORITY}; + NTSTATUS ret; + + TRACE("pAcl=%p\n", pAcl); *pAcl = NULL; - return STATUS_SUCCESS; + + new_sid = RtlAllocateHeap(GetProcessHeap(), 0, SECURITY_MAX_SID_SIZE); + if (new_sid) + { + ret = NtOpenThreadToken(GetCurrentThread(), + TOKEN_QUERY, + TRUE, + &token); + if (ret == STATUS_NO_TOKEN) + { + ret = NtOpenProcessToken(GetCurrentProcess(), + TOKEN_QUERY, + &token); + if (!NT_SUCCESS(ret)) + { + RtlFreeHeap(GetProcessHeap(), 0, new_sid); + return ret; + } + } + + /* Get the length of the owner's SID. */ + ret = NtQueryInformationToken(token, + TokenOwner, + NULL, + 0, + &owner_sid_length); + if (ret == STATUS_BUFFER_TOO_SMALL) + { + owner = RtlAllocateHeap(GetProcessHeap(), 0, owner_sid_length); + if (owner) + { + /* Actually get the owner's SID. */ + ret = NtQueryInformationToken(token, + TokenOwner, + owner, + owner_sid_length, + &owner_sid_length); + if (NT_SUCCESS(ret)) + { + acl_length = sizeof(ACL) + + (5 * sizeof(ACCESS_ALLOWED_ACE)) + + RtlLengthRequiredSid(1) + /* Local System */ + RtlLengthRequiredSid(2) + /* Administrators */ + RtlLengthRequiredSid(1) + /* World */ + RtlLengthRequiredSid(1) + /* Anonymous */ + RtlLengthSid(owner->Owner); /* Owner */ + + new_acl = RtlAllocateHeap(GetProcessHeap(), 0, acl_length); + if (new_acl) + { + ret = RtlCreateAcl(new_acl, acl_length, MIN_ACL_REVISION); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_LOCAL_SYSTEM_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 2); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_BUILTIN_DOMAIN_RID; + *RtlSubAuthoritySid(new_sid, 1) = DOMAIN_ALIAS_RID_ADMINS; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &world_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_WORLD_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_READ, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_ANONYMOUS_LOGON_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_READ, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + owner->Owner); + if (NT_SUCCESS(ret)) + { + *pAcl = new_acl; + } + } + } + } + } + } + } + } + } + } + } + else + ret = STATUS_NO_MEMORY; + } + } + else + ret = STATUS_NO_MEMORY; + } + } + else + ret = STATUS_NO_MEMORY; + + if (new_sid) + RtlFreeHeap(GetProcessHeap(), 0, new_sid); + + if (owner) + RtlFreeHeap(GetProcessHeap(), 0, owner); + + if ((!NT_SUCCESS(ret)) && (new_acl)) + RtlFreeHeap(GetProcessHeap(), 0, new_acl); + + if (token) + NtClose(token); + + return ret; } -- 2.32.0

1 1

[PATCH 2/5] uuid: Add a few NPI module ids.
by Huw Davies June 24, 2021

June 24, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/uuid/uuid.c | 3 +++ include/netiodef.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index eacb83301d1..aa7ad3dd678 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -92,6 +92,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" +#define __WINE_INIT_NPI_MODULEID +#include "netiodef.h" + /* FIXME: cguids declares GUIDs but does not define their values */ /* GUIDs not declared in an exported header file */ diff --git a/include/netiodef.h b/include/netiodef.h index 4d8d469b138..3089685bef1 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -40,8 +40,10 @@ typedef const NPI_MODULEID *PNPI_MODULEID; #ifdef NONAMELESSUNION #define _U(x) (x).u +#define __U .u #else #define _U(x) (x) +#define __U #endif static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI_MODULEID *mod2 ) @@ -63,6 +65,35 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI return FALSE; } +#ifdef __WINE_INIT_NPI_MODULEID +#ifdef __cplusplus +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ + EXTERN_C const NPI_MODULEID name = \ + { .Length = sizeof(NPI_MODULEID), .Type = MIT_GUID, __U.Guid = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } +#else +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const NPI_MODULEID name DECLSPEC_HIDDEN; \ + const NPI_MODULEID name = \ + { .Length = sizeof(NPI_MODULEID), .Type = MIT_GUID, __U.Guid = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } +#endif +#else /* __WINE_INIT_MODULEID */ +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN +#endif /* __WINE_INIT_MODULEID */ + +#define DEFINE_NPI_MS_MODULEID(name, l) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + l, 0x9b1a, 0x11d4, 0x91, 0x23, 0x00, 0x50, 0x04, 0x77, 0x59, 0xbc) + +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV4_MODULEID, 0x00 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV6_MODULEID, 0x01 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_UDP_MODULEID, 0x02 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_TCP_MODULEID, 0x03 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); + +#undef DEFINE_NPI_MS_MODULEID +#undef DEFINE_NPI_GUID_MODULEID + #undef _U +#undef __U #endif /* __WINE_NETIODEF_H */ -- 2.23.0

2 1