[PATCH 0/1] MR6112: light.msstyles: Add Explorer::ListView subclass. - Wine-gitlab - list.winehq.org

newer
[PATCH v9 0/3] MR5909:...

[PATCH 0/1] MR6112: light.msstyles: Add Explorer::ListView subclass.

older
[PATCH 0/1] MR6108: gdiplus:...

Zhiyi Zhang (＠zhiyi)

18 Jul 2024 18 Jul '24

4:08 a.m.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56861 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6112

Reply

Sign in to reply online Use email software

Show replies by date

Zhiyi Zhang

18 Jul 18 Jul

4:08 a.m.

New subject: [PATCH 1/1] light.msstyles: Add Explorer::ListView subclass.

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56861 --- dlls/light.msstyles/Makefile.in | 4 + .../blue_explorer_listview_item_hot.bmp | Bin 0 -> 334 bytes .../blue_explorer_listview_item_hot.svg | 4 + ...ue_explorer_listview_item_hot_selected.bmp | Bin 0 -> 334 bytes ...ue_explorer_listview_item_hot_selected.svg | 4 + .../blue_explorer_listview_item_selected.bmp | Bin 0 -> 334 bytes .../blue_explorer_listview_item_selected.svg | 4 + ...lorer_listview_item_selected_not_focus.bmp | Bin 0 -> 334 bytes ...lorer_listview_item_selected_not_focus.svg | 4 + dlls/light.msstyles/light.rc | 211 +++++++++++++++++- 10 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_explorer_listview_item_hot.bmp create mode 100644 dlls/light.msstyles/blue_explorer_listview_item_hot.svg create mode 100644 dlls/light.msstyles/blue_explorer_listview_item_hot_selected.bmp create mode 100644 dlls/light.msstyles/blue_explorer_listview_item_hot_selected.svg create mode 100644 dlls/light.msstyles/blue_explorer_listview_item_selected.bmp create mode 100644 dlls/light.msstyles/blue_explorer_listview_item_selected.svg create mode 100644 dlls/light.msstyles/blue_explorer_listview_item_selected_not_focus.bmp create mode 100644 dlls/light.msstyles/blue_explorer_listview_item_selected_not_focus.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 1c432b8d911..519830fb31c 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -54,6 +54,10 @@ SOURCES = \ blue_edit_border_hvscroll.svg \ blue_edit_border_noscroll.svg \ blue_edit_border_vscroll.svg \ + blue_explorer_listview_item_hot.svg \ + blue_explorer_listview_item_hot_selected.svg \ + blue_explorer_listview_item_selected.svg \ + blue_explorer_listview_item_selected_not_focus.svg \ blue_explorer_treeview_glyph_16px.svg \ blue_explorer_treeview_glyph_20px.svg \ blue_explorer_treeview_glyph_24px.svg \ diff --git a/dlls/light.msstyles/blue_explorer_listview_item_hot.bmp b/dlls/light.msstyles/blue_explorer_listview_item_hot.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a0a1c73118544101c7b5315a42f0128d083d97bc GIT binary patch literal 334 zcmZ?r^<!iJgDxOh1H|l5%*dd?zzk#`0b)$>pMe2_KvMsm+=GfS)!-LlL6iPDSyyAI FV*uH!WI6x< literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_explorer_listview_item_hot.svg b/dlls/light.msstyles/blue_explorer_listview_item_hot.svg new file mode 100644 index 00000000000..6681bbc5463 --- /dev/null +++ b/dlls/light.msstyles/blue_explorer_listview_item_hot.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="7" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg"> + <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".15686"/> +</svg> diff --git a/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.bmp b/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fd2283b430c93bbf03ac81bbf6ff3a1c0a0d510d GIT binary patch literal 334 zcmZ?r^<!iJgDxOh1H|l5%*dd?zzk#`0b)$>pMe2_KvMsm+=GfS)!-LlL6iP9&0xV$ F#{d$1e2D-6 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.svg b/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.svg new file mode 100644 index 00000000000..7e6c2570723 --- /dev/null +++ b/dlls/light.msstyles/blue_explorer_listview_item_hot_selected.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg"> + <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".62745"/> +</svg> diff --git a/dlls/light.msstyles/blue_explorer_listview_item_selected.bmp b/dlls/light.msstyles/blue_explorer_listview_item_selected.bmp new file mode 100644 index 0000000000000000000000000000000000000000..91a22cfc58af39652acf2454fe7b2ec2a531264f GIT binary patch literal 334 zcmZ?r^<!iJgDxOh1H|l5%*dd?zzk#`0b)$>pMe2_KvMsm+=GfS)!-LlL6iPD%^+Z? FV*oL(Z3qAW literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_explorer_listview_item_selected.svg b/dlls/light.msstyles/blue_explorer_listview_item_selected.svg new file mode 100644 index 00000000000..67e7733b084 --- /dev/null +++ b/dlls/light.msstyles/blue_explorer_listview_item_selected.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg"> + <rect width="1.8521" height="1.8521" fill="#3096fa" fill-opacity=".31373"/> +</svg> diff --git a/dlls/light.msstyles/blue_explorer_listview_item_selected_not_focus.bmp b/dlls/light.msstyles/blue_explorer_listview_item_selected_not_focus.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7300710d1f1b4562d19b850c886928f57fb17f07 GIT binary patch literal 334 zcmZ?r^<!iJgDxOh1H|l5%*dd?zzk#`0b)$>pMe2_KvMsm+=GfS)!-LlL6csyW{t*B F#{fVoa+Lr8 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_explorer_listview_item_selected_not_focus.svg b/dlls/light.msstyles/blue_explorer_listview_item_selected_not_focus.svg new file mode 100644 index 00000000000..583498e1463 --- /dev/null +++ b/dlls/light.msstyles/blue_explorer_listview_item_selected_not_focus.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="7" d="bitmap:7-32" version="1.1" viewBox="0 0 1.8521 1.8521" xmlns="http://www.w3.org/2000/svg"> + <rect width="1.8521" height="1.8521" fill="#aeaeae" fill-opacity=".15686"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index feb48034dea..0db71b6136b 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1,5 +1,5 @@ /* - * Copyright 2021-2022 Zhiyi Zhang for CodeWeavers + * Copyright 2021-2024 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -906,6 +906,202 @@ BLUE_INI TEXTFILE "SizingMargins = 0, 0, 0, 0\r\n" "ImageFile = blue_listview_column_detail.bmp\r\n" +"\r\n; Explorer::ListView\r\n" +"[Explorer::ListView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[Explorer::ListView.ListItem(Hot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_explorer_listview_item_hot.bmp\r\n" + +"[Explorer::ListView.ListItem(Selected)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"TextColor = 0 0 0\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_explorer_listview_item_selected.bmp\r\n" + +"[Explorer::ListView.ListItem(SelectedNotFocus)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_explorer_listview_item_selected_not_focus.bmp\r\n" + +"[Explorer::ListView.ListItem(HotSelected)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_explorer_listview_item_hot_selected.bmp\r\n" + +"[Explorer::ListView.GroupHeader]\r\n" +"BgType = None\r\n" +"Heading1TextColor = 0 0 0\r\n" +"Heading2TextColor = 0 0 0\r\n" +"BodyTextColor = 0 0 0\r\n" +"ContentMargins = 10, 10, 2, 3\r\n" +"Font = Tahoma, 9\r\n" +"Heading1Font = Tahoma, 9\r\n" +"Heading2Font = Tahoma, 9\r\n" +"BodyFont = Tahoma, 9\r\n" + +"[Explorer::ListView.GroupHeader(OpenHot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_open_hot.bmp\r\n" + +"[Explorer::ListView.GroupHeader(OpenSelectedHot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_open_selected_hot.bmp\r\n" + +"[Explorer::ListView.GroupHeader(OpenSelectedNotFocusedHot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_open_selected_not_focused_hot.bmp\r\n" + +"[Explorer::ListView.GroupHeader(OpenMixedSelectionHot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_open_mixed_selection_hot.bmp\r\n" + +"[Explorer::ListView.GroupHeader(CloseHot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_close_hot.bmp\r\n" + +"[Explorer::ListView.GroupHeader(CloseSelected)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_close_selected.bmp\r\n" + +"[Explorer::ListView.GroupHeader(CloseSelectedHot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_close_selected_hot.bmp\r\n" + +"[Explorer::ListView.GroupHeader(CloseSelectedNotFocused)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_close_selected_not_focused.bmp\r\n" + +"[Explorer::ListView.GroupHeader(CloseSelectedNotFocusedHot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_close_selected_not_focused_hot.bmp\r\n" + +"[Explorer::ListView.GroupHeader(CloseMixedSelection)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_close_mixed_selection.bmp\r\n" + +"[Explorer::ListView.GroupHeader(CloseMixedSelectionHot)]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 1, 1, 1, 1\r\n" +"ImageFile = blue_listview_group_header_close_mixed_selection_hot.bmp\r\n" + +"[Explorer::ListView.GroupHeaderLine]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 16\r\n" +"Transparent = True\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ImageFile = blue_listview_group_header_line.bmp\r\n" + +"[Explorer::ListView.ExpandButton]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" +"ImageCount = 3\r\n" +"ImageFile1 = blue_listview_expand_button_15px.bmp\r\n" +"ImageFile2 = blue_listview_expand_button_19px.bmp\r\n" +"ImageFile3 = blue_listview_expand_button_23px.bmp\r\n" +"ImageFile4 = blue_listview_expand_button_30px.bmp\r\n" +"ImageFile5 = blue_listview_expand_button_37px.bmp\r\n" +"ImageFile6 = blue_listview_expand_button_46px.bmp\r\n" +"ImageFile7 = blue_listview_expand_button_60px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 192\r\n" +"MinDpi5 = 240\r\n" +"MinDpi6 = 288\r\n" +"MinDpi7 = 384\r\n" + +"[Explorer::ListView.CollapseButton]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" +"ImageCount = 3\r\n" +"ImageFile1 = blue_listview_collapse_button_15px.bmp\r\n" +"ImageFile2 = blue_listview_collapse_button_19px.bmp\r\n" +"ImageFile3 = blue_listview_collapse_button_23px.bmp\r\n" +"ImageFile4 = blue_listview_collapse_button_30px.bmp\r\n" +"ImageFile5 = blue_listview_collapse_button_37px.bmp\r\n" +"ImageFile6 = blue_listview_collapse_button_46px.bmp\r\n" +"ImageFile7 = blue_listview_collapse_button_60px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 192\r\n" +"MinDpi5 = 240\r\n" +"MinDpi6 = 288\r\n" +"MinDpi7 = 384\r\n" + +"[Explorer::ListView.ColumnDetail]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 1\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ImageFile = blue_listview_column_detail.bmp\r\n" + "\r\n; Menu\r\n" "[Menu]\r\n" "BgType = None\r\n" @@ -3306,6 +3502,19 @@ BLUE_LISTVIEW_GROUP_HEADER_OPEN_SELECTED_HOT_BMP BITMAP "blue_listview_group_hea /* @makedep: blue_listview_group_header_open_selected_not_focused_hot.bmp */ BLUE_LISTVIEW_GROUP_HEADER_OPEN_SELECTED_NOT_FOCUSED_HOT_BMP BITMAP "blue_listview_group_header_open_selected_not_focused_hot.bmp" +/* Explorer::ListView */ +/* @makedep: blue_explorer_listview_item_hot.bmp */ +BLUE_EXPLORER_LISTVIEW_ITEM_HOT_BMP BITMAP "blue_explorer_listview_item_hot.bmp" + +/* @makedep: blue_explorer_listview_item_hot_selected.bmp */ +BLUE_EXPLORER_LISTVIEW_ITEM_HOT_SELECTED_BMP BITMAP "blue_explorer_listview_item_hot_selected.bmp" + +/* @makedep: blue_explorer_listview_item_selected.bmp */ +BLUE_EXPLORER_LISTVIEW_ITEM_SELECTED_BMP BITMAP "blue_explorer_listview_item_selected.bmp" + +/* @makedep: blue_explorer_listview_item_selected_not_focus.bmp */ +BLUE_EXPLORER_LISTVIEW_ITEM_SELECTED_NOT_FOCUS_BMP BITMAP "blue_explorer_listview_item_selected_not_focus.bmp" + /* Menu */ /* @makedep: blue_menu_bar_background.bmp */ BLUE_MENU_BAR_BACKGROUND_BMP BITMAP "blue_menu_bar_background.bmp" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6112

Reply

Sign in to reply online Use email software

519

Age (days ago)

519

Last active (days ago)

Download

1 comments

2 participants

tags

participants (2)

Zhiyi Zhang
Zhiyi Zhang (＠zhiyi)