Take into account the sunken border for Win98 look.
Leave a 1 pixel gap to the left of menu bitmap items for symetry (and
because Win9x does it).
Leave a 1 pixel gap above menu bar items for symetry (and because
Win9x does it).
diff --git a/controls/menu.c b/controls/menu.c
index 1927274..7aa45a9 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -854,6 +854,11 @@
{
lpitem->rect.right += bm.bmWidth;
lpitem->rect.bottom += bm.bmHeight;
+ if (TWEAK_WineLook == WIN98_LOOK) {
+ /* Leave space for the sunken border */
+ lpitem->rect.right += 2;
+ lpitem->rect.bottom += 2;
+ }
}
}
@@ -914,7 +919,7 @@
SelectObject( hdc, hMenuFont);
start = 0;
- maxX = (TWEAK_WineLook == WIN31_LOOK) ? GetSystemMetrics(SM_CXBORDER) : 2 ;
+ maxX = (TWEAK_WineLook == WIN31_LOOK) ? GetSystemMetrics(SM_CXBORDER) : 2+1 ;
while (start < lppop->nItems)
{
@@ -988,7 +993,7 @@
lprect->left, lprect->top, lprect->right, lprect->bottom);
lppop->Width = lprect->right - lprect->left;
lppop->Height = 0;
- maxY = lprect->top;
+ maxY = lprect->top+1;
start = 0;
helpPos = -1;
while (start < lppop->nItems)
