diff --git a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/Preferences.java b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/Preferences.java index 4b07f67a54..4f07a2b3e0 100644 --- a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/Preferences.java +++ b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/Preferences.java @@ -33,6 +33,8 @@ public class Preferences @Preference public static String probe_display; /** Preference setting */ public static final List pv_name_patches = new ArrayList<>(); + /** Preference setting */ + @Preference public static int default_zoom_factor; static { diff --git a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ZoomAction.java b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ZoomAction.java index 6e6f011bcf..01859028e2 100644 --- a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ZoomAction.java +++ b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ZoomAction.java @@ -8,6 +8,7 @@ package org.csstudio.display.builder.runtime.app; import org.csstudio.display.builder.representation.javafx.JFXRepresentation; +import org.csstudio.display.builder.runtime.Preferences; import javafx.application.Platform; import javafx.scene.control.ComboBox; @@ -33,6 +34,15 @@ public ZoomAction(final DisplayRuntimeInstance instance) getEditor().setText(txt); }); setOnAction(event -> zoom(instance.getRepresentation())); + + // Apply default zoom factor from settings.ini + Platform.runLater(() -> + { + String zoom = String.format("%d %%", Preferences.default_zoom_factor); + setValue(zoom); + // Invoke zoom changed handler + getOnAction().handle(null); + }); } private void zoom(final JFXRepresentation representation) diff --git a/app/display/runtime/src/main/resources/display_runtime_preferences.properties b/app/display/runtime/src/main/resources/display_runtime_preferences.properties index f5450ea396..9e23ee7bd5 100644 --- a/app/display/runtime/src/main/resources/display_runtime_preferences.properties +++ b/app/display/runtime/src/main/resources/display_runtime_preferences.properties @@ -46,3 +46,6 @@ update_throttle=250 # When left empty, the "Probe Display" # context menu entry is disabled. probe_display=examples:/probe.bob + +# Default zoom factor (percentage) of display runtime window +default_zoom_factor=100