[PATCH 0/5] MR297: uxtheme: Support parsing more listview parts and states.
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/297
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 17fae04968b..146df4f254a 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -617,6 +617,49 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {LVP_LISTDETAIL, 0, L"LISTDETAIL"}, {LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"}, {LVP_EMPTYTEXT, 0, L"EMPTYTEXT"}, + {LVP_GROUPHEADER, 0, L"GROUPHEADER"}, + {LVP_GROUPHEADER, LVGH_OPEN, L"OPEN"}, + {LVP_GROUPHEADER, LVGH_OPENHOT, L"OPENHOT"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTED, L"OPENSELECTED"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDHOT, L"OPENSELECTEDHOT"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDNOTFOCUSED, L"OPENSELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDNOTFOCUSEDHOT, L"OPENSELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADER, LVGH_OPENMIXEDSELECTION, L"OPENMIXEDSELECTION"}, + {LVP_GROUPHEADER, LVGH_OPENMIXEDSELECTIONHOT, L"OPENMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSE, L"CLOSE"}, + {LVP_GROUPHEADER, LVGH_CLOSEHOT, L"CLOSEHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTED, L"CLOSESELECTED"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDHOT, L"CLOSESELECTEDHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDNOTFOCUSED, L"CLOSESELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDNOTFOCUSEDHOT, L"CLOSESELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSEMIXEDSELECTION, L"CLOSEMIXEDSELECTION"}, + {LVP_GROUPHEADER, LVGH_CLOSEMIXEDSELECTIONHOT, L"CLOSEMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADERLINE, 0, L"GROUPHEADERLINE"}, + {LVP_GROUPHEADERLINE, LVGHL_OPEN, L"OPEN"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENHOT, L"OPENHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTED, L"OPENSELECTED"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDHOT, L"OPENSELECTEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDNOTFOCUSED, L"OPENSELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDNOTFOCUSEDHOT, L"OPENSELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENMIXEDSELECTION, L"OPENMIXEDSELECTION"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENMIXEDSELECTIONHOT, L"OPENMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSE, L"CLOSE"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEHOT, L"CLOSEHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTED, L"CLOSESELECTED"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDHOT, L"CLOSESELECTEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDNOTFOCUSED, L"CLOSESELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDNOTFOCUSEDHOT, L"CLOSESELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEMIXEDSELECTION, L"CLOSEMIXEDSELECTION"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEMIXEDSELECTIONHOT, L"CLOSEMIXEDSELECTIONHOT"}, + {LVP_EXPANDBUTTON, 0, L"EXPANDBUTTON"}, + {LVP_EXPANDBUTTON, LVEB_NORMAL, L"NORMAL"}, + {LVP_EXPANDBUTTON, LVEB_HOVER, L"HOVER"}, + {LVP_EXPANDBUTTON, LVEB_PUSHED, L"PUSHED"}, + {LVP_COLLAPSEBUTTON, 0, L"COLLAPSEBUTTON"}, + {LVP_COLLAPSEBUTTON, LVCB_NORMAL, L"NORMAL"}, + {LVP_COLLAPSEBUTTON, LVCB_HOVER, L"HOVER"}, + {LVP_COLLAPSEBUTTON, LVCB_PUSHED, L"PUSHED"}, + {LVP_COLUMNDETAIL, 0, L"COLUMNDETAIL"}, {0, 0, L""} }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 146df4f254a..fa79c9d8840 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -728,6 +728,25 @@ static const MSSTYLES_CLASS_MAP classMenuband[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classNavigation[] = { + {NAV_BACKBUTTON, 0, L"BACKBUTTON"}, + {NAV_BACKBUTTON, NAV_BB_NORMAL, L"NORMAL"}, + {NAV_BACKBUTTON, NAV_BB_HOT, L"HOT"}, + {NAV_BACKBUTTON, NAV_BB_PRESSED, L"PRESSED"}, + {NAV_BACKBUTTON, NAV_BB_DISABLED, L"DISABLED"}, + {NAV_FORWARDBUTTON, 0, L"FORWARDBUTTON"}, + {NAV_FORWARDBUTTON, NAV_FB_NORMAL, L"NORMAL"}, + {NAV_FORWARDBUTTON, NAV_FB_HOT, L"HOT"}, + {NAV_FORWARDBUTTON, NAV_FB_PRESSED, L"PRESSED"}, + {NAV_FORWARDBUTTON, NAV_FB_DISABLED, L"DISABLED"}, + {NAV_MENUBUTTON, 0, L"MENUBUTTON"}, + {NAV_MENUBUTTON, NAV_MB_NORMAL, L"NORMAL"}, + {NAV_MENUBUTTON, NAV_MB_HOT, L"HOT"}, + {NAV_MENUBUTTON, NAV_MB_PRESSED, L"PRESSED"}, + {NAV_MENUBUTTON, NAV_MB_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classPage[] = { {PGRP_UP, 0, L"UP"}, {PGRP_UP, UPS_NORMAL, L"NORMAL"}, @@ -1253,6 +1272,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classListview, L"LISTVIEW"}, {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, + {classNavigation, L"NAVIGATION"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, {classRebar, L"REBAR"}, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index fa79c9d8840..2d8ea05bb5c 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -808,6 +808,18 @@ static const MSSTYLES_CLASS_MAP classRebar[] = { {RP_CHEVRON, CHEVS_HOT, L"HOT"}, {RP_CHEVRON, CHEVS_PRESSED, L"PRESSED"}, {RP_CHEVRONVERT, 0, L"CHEVRONVERT"}, + {RP_CHEVRONVERT, CHEVSV_NORMAL, L"NORMAL"}, + {RP_CHEVRONVERT, CHEVSV_HOT, L"HOT"}, + {RP_CHEVRONVERT, CHEVSV_PRESSED, L"PRESSED"}, + {RP_BACKGROUND, 0, L"BACKGROUND"}, + {RP_SPLITTER, 0, L"SPLITTER"}, + {RP_SPLITTER, SPLITS_NORMAL, L"NORMAL"}, + {RP_SPLITTER, SPLITS_HOT, L"HOT"}, + {RP_SPLITTER, SPLITS_PRESSED, L"PRESSED"}, + {RP_SPLITTERVERT, 0, L"SPLITTERVERT"}, + {RP_SPLITTERVERT, SPLITSV_NORMAL, L"NORMAL"}, + {RP_SPLITTERVERT, SPLITSV_HOT, L"HOT"}, + {RP_SPLITTERVERT, SPLITSV_PRESSED, L"PRESSED"}, {0, 0, L""} }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 27 +++++++++++++++++++++++++++ include/vsstyle.h | 1 + 2 files changed, 28 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 2d8ea05bb5c..b8e9eb95e43 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -841,41 +841,68 @@ static const MSSTYLES_CLASS_MAP classScrollbar[] = { {SBP_ARROWBTN, ABS_RIGHTHOT, L"RIGHTHOT"}, {SBP_ARROWBTN, ABS_RIGHTPRESSED, L"RIGHTPRESSED"}, {SBP_ARROWBTN, ABS_RIGHTDISABLED, L"RIGHTDISABLED"}, + {SBP_ARROWBTN, ABS_UPHOVER, L"UPHOVER"}, + {SBP_ARROWBTN, ABS_DOWNHOVER, L"DOWNHOVER"}, + {SBP_ARROWBTN, ABS_LEFTHOVER, L"LEFTHOVER"}, + {SBP_ARROWBTN, ABS_RIGHTHOVER, L"RIGHTHOVER"}, {SBP_THUMBBTNHORZ, 0, L"THUMBBTNHORZ"}, {SBP_THUMBBTNHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_THUMBBTNHORZ, SCRBS_HOT, L"HOT"}, {SBP_THUMBBTNHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_THUMBBTNHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_THUMBBTNHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_THUMBBTNVERT, 0, L"THUMBBTNVERT"}, {SBP_THUMBBTNVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_THUMBBTNVERT, SCRBS_HOT, L"HOT"}, {SBP_THUMBBTNVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_THUMBBTNVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_THUMBBTNVERT, SCRBS_HOVER, L"HOVER"}, {SBP_LOWERTRACKHORZ, 0, L"LOWERTRACKHORZ"}, {SBP_LOWERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_LOWERTRACKHORZ, SCRBS_HOT, L"HOT"}, {SBP_LOWERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_LOWERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_LOWERTRACKHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_UPPERTRACKHORZ, 0, L"UPPERTRACKHORZ"}, {SBP_UPPERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_UPPERTRACKHORZ, SCRBS_HOT, L"HOT"}, {SBP_UPPERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_UPPERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_UPPERTRACKHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_LOWERTRACKVERT, 0, L"LOWERTRACKVERT"}, {SBP_LOWERTRACKVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_LOWERTRACKVERT, SCRBS_HOT, L"HOT"}, {SBP_LOWERTRACKVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_LOWERTRACKVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_LOWERTRACKVERT, SCRBS_HOVER, L"HOVER"}, {SBP_UPPERTRACKVERT, 0, L"UPPERTRACKVERT"}, {SBP_UPPERTRACKVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_UPPERTRACKVERT, SCRBS_HOT, L"HOT"}, {SBP_UPPERTRACKVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_UPPERTRACKVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_UPPERTRACKVERT, SCRBS_HOVER, L"HOVER"}, {SBP_GRIPPERHORZ, 0, L"GRIPPERHORZ"}, + {SBP_GRIPPERHORZ, SCRBS_NORMAL, L"NORMAL"}, + {SBP_GRIPPERHORZ, SCRBS_HOT, L"HOT"}, + {SBP_GRIPPERHORZ, SCRBS_PRESSED, L"PRESSED"}, + {SBP_GRIPPERHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_GRIPPERHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_GRIPPERVERT, 0, L"GRIPPERVERT"}, + {SBP_GRIPPERVERT, SCRBS_NORMAL, L"NORMAL"}, + {SBP_GRIPPERVERT, SCRBS_HOT, L"HOT"}, + {SBP_GRIPPERVERT, SCRBS_PRESSED, L"PRESSED"}, + {SBP_GRIPPERVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_GRIPPERVERT, SCRBS_HOVER, L"HOVER"}, {SBP_SIZEBOX, 0, L"SIZEBOX"}, {SBP_SIZEBOX, SZB_RIGHTALIGN, L"RIGHTALIGN"}, {SBP_SIZEBOX, SZB_LEFTALIGN, L"LEFTALIGN"}, + {SBP_SIZEBOX, SZB_TOPRIGHTALIGN, L"TOPRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_TOPLEFTALIGN, L"TOPLEFTALIGN"}, + {SBP_SIZEBOX, SZB_HALFBOTTOMRIGHTALIGN, L"HALFBOTTOMRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_HALFBOTTOMLEFTALIGN, L"HALFBOTTOMLEFTALIGN"}, + {SBP_SIZEBOX, SZB_HALFTOPRIGHTALIGN, L"HALFTOPRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_HALFTOPLEFTALIGN, L"HALFTOPLEFTALIGN"}, + {SBP_SIZEBOXBKGND, 0, L"SIZEBOXBKGND"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index 3075b4cdc08..b527c15a29a 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1045,6 +1045,7 @@ enum SCROLLBARPARTS { SBP_GRIPPERHORZ = 8, SBP_GRIPPERVERT = 9, SBP_SIZEBOX = 10, + SBP_SIZEBOXBKGND = 11, }; #define SCROLLBARSTYLEPARTS SCROLLBARPARTS; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index b8e9eb95e43..8da93ef321d 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -948,6 +948,35 @@ static const MSSTYLES_CLASS_MAP classStartpanel[] = { {SPP_LOGOFFBUTTONS, SPLS_PRESSED, L"PRESSED"}, {SPP_USERPICTURE, 0, L"USERPICTURE"}, {SPP_PREVIEW, 0, L"PREVIEW"}, + {SPP_MOREPROGRAMSTAB, 0, L"MOREPROGRAMSTAB"}, + {SPP_MOREPROGRAMSTAB, SPMPT_NORMAL, L"NORMAL"}, + {SPP_MOREPROGRAMSTAB, SPMPT_HOT, L"HOT"}, + {SPP_MOREPROGRAMSTAB, SPMPT_SELECTED, L"SELECTED"}, + {SPP_MOREPROGRAMSTAB, SPMPT_DISABLED, L"DISABLED"}, + {SPP_MOREPROGRAMSTAB, SPMPT_FOCUSED, L"FOCUSED"}, + {SPP_NSCHOST, 0, L"NSCHOST"}, + {SPP_SOFTWAREEXPLORER, 0, L"SOFTWAREEXPLORER"}, + {SPP_SOFTWAREEXPLORER, SPSE_NORMAL, L"NORMAL"}, + {SPP_SOFTWAREEXPLORER, SPSE_HOT, L"HOT"}, + {SPP_SOFTWAREEXPLORER, SPSE_SELECTED, L"SELECTED"}, + {SPP_SOFTWAREEXPLORER, SPSE_DISABLED, L"DISABLED"}, + {SPP_SOFTWAREEXPLORER, SPSE_FOCUSED, L"FOCUSED"}, + {SPP_OPENBOX, 0, L"OPENBOX"}, + {SPP_OPENBOX, SPOB_NORMAL, L"NORMAL"}, + {SPP_OPENBOX, SPOB_HOT, L"HOT"}, + {SPP_OPENBOX, SPOB_SELECTED, L"SELECTED"}, + {SPP_OPENBOX, SPOB_DISABLED, L"DISABLED"}, + {SPP_OPENBOX, SPOB_FOCUSED, L"FOCUSED"}, + {SPP_SEARCHVIEW, 0, L"SEARCHVIEW"}, + {SPP_MOREPROGRAMSARROWBACK, 0, L"MOREPROGRAMSARROWBACK"}, + {SPP_MOREPROGRAMSARROWBACK, SPSB_NORMAL, L"NORMAL"}, + {SPP_MOREPROGRAMSARROWBACK, SPSB_HOT, L"HOT"}, + {SPP_MOREPROGRAMSARROWBACK, SPSB_PRESSED, L"PRESSED"}, + {SPP_TOPMATCH, 0, L"TOPMATCH"}, + {SPP_LOGOFFSPLITBUTTONDROPDOWN, 0, L"LOGOFFSPLITBUTTONDROPDOWN"}, + {SPP_LOGOFFSPLITBUTTONDROPDOWN, SPLS_NORMAL, L"NORMAL"}, + {SPP_LOGOFFSPLITBUTTONDROPDOWN, SPLS_HOT, L"HOT"}, + {SPP_LOGOFFSPLITBUTTONDROPDOWN, SPLS_PRESSED, L"PRESSED"}, {0, 0, L""} }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/297
participants (2)
-
Zhiyi Zhang -
Zhiyi Zhang (＠zhiyi)