Skip to content

[Win32] Fix wrong layout when opening shell or reparenting control #2608 #2637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2025
Merged

[Win32] Fix wrong layout when opening shell or reparenting control #2608 #2637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/DPITestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private DPITestUtil() {

public static void changeDPIZoom (Shell shell, int nativeZoom) {
DPIUtil.setDeviceZoom(nativeZoom);
Event event = shell.createZoomChangedEvent(nativeZoom);
Event event = shell.createZoomChangedEvent(nativeZoom, true);
shell.sendZoomChangedEvent(event, shell);
DPIChangeExecution data = (DPIChangeExecution) event.data;
waitForDPIChange(shell, TIMEOUT_MILLIS, data.taskCount);
Expand Down
20 changes: 11 additions & 9 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4784,12 +4784,9 @@ public boolean setParent (Composite parent) {
if (OS.SetParent (topHandle, parent.handle) == 0) return false;
this.parent = parent;
// If parent changed, zoom level might need to be adjusted
if (parent.nativeZoom != nativeZoom) {
int newZoom = parent.nativeZoom;
Event zoomChangedEvent = createZoomChangedEvent(newZoom);
if (currentDpiChangeEvent != null) {
currentDpiChangeEvent.doit = false;
}
int newZoom = parent.nativeZoom;
if (newZoom != nativeZoom) {
Event zoomChangedEvent = createZoomChangedEvent(newZoom, false);
sendZoomChangedEvent(zoomChangedEvent, getShell());
}
int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE;
Expand Down Expand Up @@ -4985,7 +4982,10 @@ LRESULT WM_DESTROY (long wParam, long lParam) {

private void handleMonitorSpecificDpiChange(int newNativeZoom, Rectangle newBoundsInPixels) {
DPIUtil.setDeviceZoom (newNativeZoom);
Event zoomChangedEvent = createZoomChangedEvent(newNativeZoom);
// Do not process DPI change for child shells asynchronous to avoid relayouting when
// repositioning the child shell to a different monitor upon opening
boolean processDpiChangeAsynchronous = getShell().getParent() == null;
Event zoomChangedEvent = createZoomChangedEvent(newNativeZoom, processDpiChangeAsynchronous);
if (currentDpiChangeEvent != null) {
currentDpiChangeEvent.doit = false;
}
Expand All @@ -4994,13 +4994,15 @@ private void handleMonitorSpecificDpiChange(int newNativeZoom, Rectangle newBoun
this.setBoundsInPixels(newBoundsInPixels.x, newBoundsInPixels.y, newBoundsInPixels.width, newBoundsInPixels.height);
}

Event createZoomChangedEvent(int zoom) {
Event createZoomChangedEvent(int zoom, boolean asyncExec) {
Event event = new Event();
event.type = SWT.ZoomChanged;
event.widget = this;
event.detail = zoom;
event.doit = true;
event.data = new DPIChangeExecution();
DPIChangeExecution dpiChangeExecution = new DPIChangeExecution();
dpiChangeExecution.asyncExec = asyncExec;
event.data = dpiChangeExecution;
return event;
}

Expand Down
Loading