Only prompt for restart on zoom change when not rescaling at runtime

When the zoom of the primary monitor changes, the workbench asks for a
restart to adapt the workbench windows to the changed zoom. With the
runtime rescaling functionality recently introduced to SWT, this
behavior is only desired if that rescaling functionality is not
activated. This change adapts the functionality for showing the restart
prompt to only come up if the rescaling functionality is deactivated.

Author: HeikoKlare

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java

@@ -934,27 +934,33 @@ public void run() throws Exception {
 
 			getShell().setData(this);
 			trackShellActivation();
-			/**
-			 * When SWT zoom changes for primary monitor, prompt user to restart Eclipse to
-			 * apply the changes.
-			 */
-			getShell().addListener(SWT.ZoomChanged, event -> {
-				if (getShell().getDisplay().getPrimaryMonitor().equals(getShell().getMonitor())) {
-					int dialogResponse = MessageDialog.open(MessageDialog.QUESTION, getShell(),
-							WorkbenchMessages.Workbench_zoomChangedTitle,
-							WorkbenchMessages.Workbench_zoomChangedMessage, SWT.NONE,
-							WorkbenchMessages.Workbench_RestartButton, WorkbenchMessages.Workbench_DontRestartButton);
-					if (event.doit && dialogResponse == 0) {
-						getWorkbenchImpl().restart(true);
-					}
-				}
-			});
-
+			addZoomChangeListenerToPromptForRestart();
 		} finally {
 			HandlerServiceImpl.pop();
 		}
 	}
 
+	private void addZoomChangeListenerToPromptForRestart() {
+		getShell().addListener(SWT.ZoomChanged, event -> {
+			/**
+			 * Prompt for restart when an SWT zoom change for the primary monitor occurs,
+			 * only when rescaling at runtime is not activated.
+			 */
+			if (getShell().getDisplay().isRescalingAtRuntime()) {
+				return;
+			}
+			if (getShell().getDisplay().getPrimaryMonitor().equals(getShell().getMonitor())) {
+				int dialogResponse = MessageDialog.open(MessageDialog.QUESTION, getShell(),
+						WorkbenchMessages.Workbench_zoomChangedTitle, WorkbenchMessages.Workbench_zoomChangedMessage,
+						SWT.NONE, WorkbenchMessages.Workbench_RestartButton,
+						WorkbenchMessages.Workbench_DontRestartButton);
+				if (event.doit && dialogResponse == 0) {
+					getWorkbenchImpl().restart(true);
+				}
+			}
+		});
+	}
+
 	@PreDestroy
 	void preDestroy() {
 		if (mainMenu != null) {