Suggeted Cosmetic Changes

Author: ShahzaibIbrahim

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

@@ -1225,7 +1225,8 @@ LRESULT wmMeasureChild (long wParam, long lParam) {
 			 * position. I have tested on Win7, Win8.1, Win10 and found
 			 * that value of 5 works well in matching text to mnemonic.
 			 */
-			struct.itemWidth = DPIUtil.scaleUp(LEFT_TEXT_MARGIN + point.x - WINDOWS_OVERHEAD + (this.image != null ? this.image.getBounds().width + IMAGE_TEXT_GAP: 0), menuZoom);
+			int horizontalSpaceImage = this.image != null ? this.image.getBounds().width + IMAGE_TEXT_GAP: 0;
+			struct.itemWidth = DPIUtil.scaleUp(LEFT_TEXT_MARGIN + point.x - WINDOWS_OVERHEAD + horizontalSpaceImage, menuZoom);
 			OS.MoveMemory (lParam, struct, MEASUREITEMSTRUCT.sizeof);
 			return null;
 		}
@@ -1275,9 +1276,7 @@ private Point calculateRenderedTextSize() {
 	Point points = gc.textExtent(textWithoutMnemonicCharacter);
 	gc.dispose();
 
-	if (getDisplay().isRescalingAtRuntime()) {
-		return points;
-	} else {
+	if (!getDisplay().isRescalingAtRuntime()) {
 		int primaryMonitorZoom = this.getDisplay().getDeviceZoom();
 		int adjustedPrimaryMonitorZoom = DPIUtil.getZoomForAutoscaleProperty(primaryMonitorZoom);
 		if (primaryMonitorZoom != adjustedPrimaryMonitorZoom) {
@@ -1293,8 +1292,8 @@ private Point calculateRenderedTextSize() {
 			// This is the only place, where the GC needs to use the native zoom to do that, therefore it is fixed only here
 			points = DPIUtil.scaleDown(DPIUtil.scaleUp(points, adjustedPrimaryMonitorZoom), primaryMonitorZoom);
 		}
-		return points;
 	}
+	return points;
 }
 
 private static final class MenuItemToolTip extends ToolTip {