Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9650f21b
Commit
9650f21b
authored
Jan 16, 2015
by
Huw Davies
Committed by
Alexandre Julliard
Jan 16, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Actually use the menu's background brush.
parent
14f7fd4e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
menu.c
dlls/user32/menu.c
+6
-5
No files found.
dlls/user32/menu.c
View file @
9650f21b
...
...
@@ -1737,15 +1737,17 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
*/
static
void
MENU_DrawPopupMenu
(
HWND
hwnd
,
HDC
hdc
,
HMENU
hmenu
)
{
HBRUSH
hPrevBrush
=
0
;
HBRUSH
hPrevBrush
=
0
,
brush
=
GetSysColorBrush
(
COLOR_MENU
)
;
RECT
rect
;
POPUPMENU
*
menu
=
MENU_GetMenu
(
hmenu
);
TRACE
(
"wnd=%p dc=%p menu=%p
\n
"
,
hwnd
,
hdc
,
hmenu
);
GetClientRect
(
hwnd
,
&
rect
);
if
((
hPrevBrush
=
SelectObject
(
hdc
,
GetSysColorBrush
(
COLOR_MENU
)
))
&&
(
SelectObject
(
hdc
,
get_menu_font
(
FALSE
))))
if
(
menu
&&
menu
->
hbrBack
)
brush
=
menu
->
hbrBack
;
if
((
hPrevBrush
=
SelectObject
(
hdc
,
brush
))
&&
SelectObject
(
hdc
,
get_menu_font
(
FALSE
)
))
{
HPEN
hPrevPen
;
...
...
@@ -1754,7 +1756,6 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
hPrevPen
=
SelectObject
(
hdc
,
GetStockObject
(
NULL_PEN
)
);
if
(
hPrevPen
)
{
POPUPMENU
*
menu
;
BOOL
flat_menu
=
FALSE
;
SystemParametersInfoW
(
SPI_GETFLATMENU
,
0
,
&
flat_menu
,
0
);
...
...
@@ -1763,7 +1764,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
else
DrawEdge
(
hdc
,
&
rect
,
EDGE_RAISED
,
BF_RECT
);
if
(
(
menu
=
MENU_GetMenu
(
hmenu
))
)
if
(
menu
)
{
TRACE
(
"hmenu %p Style %08x
\n
"
,
hmenu
,
menu
->
dwStyle
);
/* draw menu items */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment