Tweaked static

Author: akoch-yatta

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java

@@ -47,9 +47,12 @@ public class MenuItem extends Item {
 	/* Image margin. */
 	final static int MARGIN_WIDTH = 1;
 	final static int MARGIN_HEIGHT = 1;
-	final static int LEFT_TEXT_MARGIN = 5;
-	final static int IMAGE_TEXT_GAP = 3;
-	final static int WINDOWS_OVERHEAD = 5;
+	private final static int LEFT_TEXT_MARGIN = 7;
+	private final static int IMAGE_TEXT_GAP = 3;
+	// There is a weird behavior in the Windows API with menus in OWENERDRAW mode that the returned
+	// value in wmMeasureChild is increased by a fixed value (in points) when wmDrawChild is called
+	// This static is used to mitigate this increase
+	private final static int WINDOWS_OVERHEAD = 6;
 	static {
 		DPIZoomChangeRegistry.registerHandler(MenuItem::handleDPIChange, MenuItem.class);
 	}
@@ -1186,7 +1189,7 @@ LRESULT wmDrawChild(long wParam, long lParam) {
 			gc.fillRectangle(menuItemArea);
 
 			int xPositionText = LEFT_TEXT_MARGIN + DPIUtil.scaleDown(x, zoom) + (this.image != null ? this.image.getBounds().width + IMAGE_TEXT_GAP : 0);
-			int yPositionText = DPIUtil.scaleDown(struct.top , zoom);
+			int yPositionText = DPIUtil.scaleDown(struct.top , zoom) + MARGIN_HEIGHT;
 			gc.drawText(drawnText, xPositionText, yPositionText, flags);
 		}
 		if (image != null) {