user32: Add a helper to retrieve the height of the scroll arrows.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Add a helper to retrieve the height of the scroll arrows.
c72a7219 · Huw Davies · Alexandre Julliard · a8344b96 · c72a7219
Commit c72a7219 authored Mar 28, 2017 by Huw Davies Committed by Alexandre Julliard Mar 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

menu.c dlls/user32/menu.c +11 -6

No files found.
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -404,6 +404,14 @@ static HBITMAP get_up_arrow_inactive_bitmap(void)
    return arrow_bitmap;
 }
+static inline UINT get_scroll_arrow_height(const POPUPMENU *menu)
+{
+    BITMAP bmp;
+    GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp);
+    return bmp.bmHeight;
+}
 /***********************************************************************
 *           MENU_CopySysPopup
 *
@@ -699,13 +707,10 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect)
 {
    if (menu->bScrolling)
    {
-        UINT arrow_bitmap_height;
+        UINT arrow_height;
-        BITMAP bmp;
-        GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp);
+        arrow_height = get_scroll_arrow_height( menu );
-        arrow_bitmap_height = bmp.bmHeight;
+        OffsetRect( rect, 0, arrow_height - menu->nScrollPos );
-        rect->top += arrow_bitmap_height - menu->nScrollPos;
-        rect->bottom += arrow_bitmap_height - menu->nScrollPos;
    }
 }