Skip to content

Commit

Permalink
Drawing custom menu items for Menu Bar
Browse files Browse the repository at this point in the history 
While switched to Dark Theme, using gc to draw menu item, moving the responsibility from OS due to wrong scaling of menu bar vertically. Also  changing the text color from a grayish tone to white.
  • Loading branch information
@ShahzaibIbrahim
ShahzaibIbrahim committed Aug 21, 2024
1 parent 97cf720 commit e10a814
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 49 deletions.
2 changes: 2 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@ public class OS extends C {
public static final int MFS_CHECKED = 0x8;
public static final int MFS_DISABLED = 0x3;
public static final int MFS_GRAYED = 0x3;
public static final int MFT_OWNERDRAW = 0x100;
public static final int MFT_RADIOCHECK = 0x200;
public static final int MFT_RIGHTJUSTIFY = 0x4000;
public static final int MFT_RIGHTORDER = 0x2000;
Expand Down Expand Up @@ -1019,6 +1020,7 @@ public class OS extends C {
public static final int OBJ_PEN = 0x1;
public static final int OBM_CHECKBOXES = 0x7ff7;
public static final int ODS_SELECTED = 0x1;
public static final int ODS_INACTIVE = 0x80;
public static final int ODT_MENU = 0x1;
public static final int OIC_BANG = 0x7F03;
public static final int OIC_HAND = 0x7F01;
Expand Down
7 changes: 7 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3694,6 +3694,13 @@ public class SWT {
*/
public static final int COLOR_WIDGET_DISABLED_FOREGROUND = 39;

/**
* Default color light blue (value is 40).
*
* @since 3.127
*/
public static final int COLOR_LIGHT_BLUE = 40;

/**
* Draw constant indicating whether the drawing operation
* should fill the background (value is 1<<0).
Expand Down
3 changes: 2 additions & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,8 @@ public Color getSystemColor (int id) {
case SWT.COLOR_DARK_GREEN: pixel = 0x00008000; break;
case SWT.COLOR_YELLOW: pixel = 0x0000FFFF; break;
case SWT.COLOR_DARK_YELLOW: pixel = 0x00008080; break;
case SWT.COLOR_BLUE: pixel = 0x00FF0000; break;
case SWT.COLOR_LIGHT_BLUE: pixel = 0x00FF9933; break;
case SWT.COLOR_BLUE: pixel = 0x00E6D8AD; break;
case SWT.COLOR_DARK_BLUE: pixel = 0x00800000; break;
case SWT.COLOR_MAGENTA: pixel = 0x00FF00FF; break;
case SWT.COLOR_DARK_MAGENTA: pixel = 0x00800080; break;
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ void createItem (MenuItem item, int index) {
info.fMask = OS.MIIM_ID | OS.MIIM_TYPE | OS.MIIM_DATA;
info.wID = item.id;
info.dwItemData = item.id;
info.fType = item.widgetStyle ();
info.fType = (style & SWT.BAR) != 0 && needsMenuCallback() ? OS.MFT_OWNERDRAW : item.widgetStyle ();
info.dwTypeData = pszText;
boolean success = OS.InsertMenuItem (handle, index, true, info);
if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
Expand Down
111 changes: 64 additions & 47 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1008,28 +1008,31 @@ public void setText (String string) {
super.setText (string);
long hHeap = OS.GetProcessHeap ();
long pszText = 0;
MENUITEMINFO info = new MENUITEMINFO ();
info.cbSize = MENUITEMINFO.sizeof;
long hMenu = parent.handle;

TCHAR buffer = new TCHAR (0, string, true);
int byteCount = buffer.length () * TCHAR.sizeof;
pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
/*
* Bug in Windows 2000. For some reason, when MIIM_TYPE is set
* on a menu item that also has MIIM_BITMAP, the MIIM_TYPE clears
* the MIIM_BITMAP style. The fix is to use MIIM_STRING.
*/
info.fMask = OS.MIIM_STRING;
info.dwTypeData = pszText;
boolean success = OS.SetMenuItemInfo (hMenu, id, false, info);
if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
if (!success) {
int error = OS.GetLastError();
SWT.error (SWT.ERROR_CANNOT_SET_TEXT, null, " [GetLastError=0x" + Integer.toHexString(error) + "]");//$NON-NLS-1$ $NON-NLS-2$
if(!parent.needsMenuCallback()) {
MENUITEMINFO info = new MENUITEMINFO ();
info.cbSize = MENUITEMINFO.sizeof;
long hMenu = parent.handle;

TCHAR buffer = new TCHAR (0, string, true);
int byteCount = buffer.length () * TCHAR.sizeof;
pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
/*
* Bug in Windows 2000. For some reason, when MIIM_TYPE is set
* on a menu item that also has MIIM_BITMAP, the MIIM_TYPE clears
* the MIIM_BITMAP style. The fix is to use MIIM_STRING.
*/
info.fMask = OS.MIIM_STRING;
info.dwTypeData = pszText;
boolean success = OS.SetMenuItemInfo (hMenu, id, false, info);
if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
if (!success) {
int error = OS.GetLastError();
SWT.error (SWT.ERROR_CANNOT_SET_TEXT, null, " [GetLastError=0x" + Integer.toHexString(error) + "]");//$NON-NLS-1$ $NON-NLS-2$
}
parent.redraw ();
}
parent.redraw ();
}

/**
Expand Down Expand Up @@ -1121,27 +1124,47 @@ LRESULT wmCommandChild (long wParam, long lParam) {
return null;
}

LRESULT wmDrawChild (long wParam, long lParam) {
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
if (image != null) {
LRESULT wmDrawChild(long wParam, long lParam) {
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT();
OS.MoveMemory(struct, lParam, DRAWITEMSTRUCT.sizeof);
if ((text != null || image != null)) {
GCData data = new GCData();
data.device = display;
GC gc = createNewGC(struct.hDC, data);
/*
* Bug in Windows. When a bitmap is included in the
* menu bar, the HDC seems to already include the left
* coordinate. The fix is to ignore this value when
* the item is in a menu bar.
*/
int x = (parent.style & SWT.BAR) != 0 ? MARGIN_WIDTH * 2 : struct.left;
Image image = getEnabled () ? this.image : new Image (display, this.image, SWT.IMAGE_DISABLE);

int x = (parent.style & SWT.BAR) == 0 ? MARGIN_WIDTH * 2 : struct.left;
int zoom = getZoom();
gc.drawImage (image, DPIUtil.scaleDown(x, zoom), DPIUtil.scaleDown(struct.top + MARGIN_HEIGHT, zoom));
if (this.image != image) image.dispose ();
gc.dispose ();
if (text != null) {
int flags = SWT.DRAW_MNEMONIC | SWT.DRAW_DELIMITER;
boolean isInactive = ((struct.itemState & OS.ODS_INACTIVE) != 0);
boolean isSelected = ((struct.itemState & OS.ODS_SELECTED) != 0);
int textMargin = 10; // left margin for x-coordinate spacing

Rectangle bounds = this.getBounds();
gc.setForeground(isInactive? display.getSystemColor(SWT.COLOR_GRAY) : display.getSystemColor(SWT.COLOR_WHITE));
gc.setBackground(isSelected? display.getSystemColor(SWT.COLOR_LIGHT_BLUE) : parent.getBackground());
int xMargin = DPIUtil.scaleDown(x + textMargin , zoom) + (this.image != null? this.image.getBounds().width: 0);
int yMargin = DPIUtil.scaleDown(struct.top + MARGIN_HEIGHT, zoom);

gc.fillRectangle( DPIUtil.scaleDown(x, zoom), DPIUtil.scaleDown(struct.top + MARGIN_HEIGHT, zoom), DPIUtil.scaleDown(bounds.width + (image != null ? image.getBounds().width : 0), zoom), DPIUtil.scaleDown(bounds.height, zoom));

gc.drawText(this.text, xMargin, yMargin, flags);
}
if (image != null) {
/*
* Bug in Windows. When a bitmap is included in the menu bar, the HDC seems to
* already include the left coordinate. The fix is to ignore this value when the
* item is in a menu bar.
*/
Image image = getEnabled() ? this.image : new Image(display, this.image, SWT.IMAGE_DISABLE);

gc.drawImage(image, DPIUtil.scaleDown(x, zoom) , DPIUtil.scaleDown(struct.top + MARGIN_HEIGHT, zoom));
if (this.image != image)
image.dispose();
}
gc.dispose();
}
if (parent.foreground != -1) OS.SetTextColor (struct.hDC, parent.foreground);
if (parent.foreground != -1) OS.SetTextColor(struct.hDC, parent.foreground);
return null;
}

Expand All @@ -1151,17 +1174,11 @@ LRESULT wmMeasureChild (long wParam, long lParam) {

if ((parent.style & SWT.BAR) != 0) {
if (parent.needsMenuCallback()) {
/*
* Weirdness in Windows. Setting `HBMMENU_CALLBACK` causes
* item sizes to mean something else. It seems that it is
* the size of left margin before the text. At the same time,
* if menu item has a mnemonic, it's always drawn at a fixed
* position. I have tested on Win7, Win8.1, Win10 and found
* that value of 5 works well in matching text to mnemonic.
* NOTE: autoScaleUpUsingNativeDPI() is used to avoid problems
* with applications that disable automatic scaling.
*/
struct.itemWidth = DPIUtil.scaleUp(5, nativeZoom);
GC gc = new GC (display);
Point points = gc.textExtent(getText());
gc.dispose ();
struct.itemHeight = DPIUtil.scaleUp(points.y, nativeZoom);
struct.itemWidth = DPIUtil.scaleUp(points.x, nativeZoom);
OS.MoveMemory (lParam, struct, MEASUREITEMSTRUCT.sizeof);
return null;
}
Expand Down

0 comments on commit e10a814

Please sign in to comment.