Merge branch 'eclipse-platform:master' into master

fedejeanne · web-flow · commit b6b5dac0b0cf · 2025-07-30T11:14:28.000+02:00
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
@@ -1291,7 +1291,7 @@ GC createNewGC(long hDC, GCData data) {
 }
 
 private int getMonitorZoom() {
-	return getMenu().getShell().getMonitor().zoom;
+	return getParent().getShell().getMonitor().zoom;
 }
 
 private int getMenuZoom() {
@@ -1425,7 +1425,7 @@ LRESULT wmMeasureChild (long wParam, long lParam) {
 }
 
 private Point calculateRenderedTextSize() {
-	GC gc = new GC(this.getMenu().getShell());
+	GC gc = new GC(this.getParent().getShell());
 	String textWithoutMnemonicCharacter = getText().replace("&", "");
 	Point points = gc.textExtent(textWithoutMnemonicCharacter);
 	gc.dispose();

Original file line number	Diff line number	Diff line change
`@@ -1291,7 +1291,7 @@ GC createNewGC(long hDC, GCData data) {`
`1291`	`1291`	`}`
`1292`	`1292`
`1293`	`1293`	`private int getMonitorZoom() {`
`1294`		`- return getMenu().getShell().getMonitor().zoom;`
	`1294`	`+ return getParent().getShell().getMonitor().zoom;`
`1295`	`1295`	`}`
`1296`	`1296`
`1297`	`1297`	`private int getMenuZoom() {`
`@@ -1425,7 +1425,7 @@ LRESULT wmMeasureChild (long wParam, long lParam) {`
`1425`	`1425`	`}`
`1426`	`1426`
`1427`	`1427`	`private Point calculateRenderedTextSize() {`
`1428`		`- GC gc = new GC(this.getMenu().getShell());`
	`1428`	`+ GC gc = new GC(this.getParent().getShell());`
`1429`	`1429`	`String textWithoutMnemonicCharacter = getText().replace("&", "");`
`1430`	`1430`	`Point points = gc.textExtent(textWithoutMnemonicCharacter);`
`1431`	`1431`	`gc.dispose();`