Merge pull request #3324 from UrbanBobek/grid-size-move

Ctrl-Arrow moves and scales widgets by the grid size

Author: kasemir

app/display/editor/src/main/java/org/csstudio/display/builder/editor/tracker/SelectedWidgetUITracker.java

@@ -230,6 +230,15 @@ public Point2D snapConstrain(final double x, final double y)
     @Override
     protected void handleKeyEvent(final KeyEvent event)
     {
+        // Update move value bigDelta to grid size
+        {
+            final DisplayModel model = getModel();
+            if(model != null) {
+                bigDeltaX = model.propGridStepX().getValue();
+                bigDeltaY = model.propGridStepY().getValue();
+            }
+        }
+
         super.handleKeyEvent(event);
         if (event.isConsumed())
             group_handler.hide();
@@ -448,8 +457,9 @@ private Boolean click(final List<Widget> widgets)
     private void passClickToWidgets(final MouseEvent event)
     {
         final DisplayModel model = getModel();
-        if (model != null)
+        if (model != null) {
             new ClickWidgets(event, model.getChildren()).compute();
+        }
     }
 
     @Override
@@ -566,6 +576,7 @@ private void updateTrackerFromWidgets()
     {
         if (updating)
             return;
+
         final Rectangle2D rect = GeometryTools.getDisplayBounds(widgets);
         updating = true;
 

core/ui/src/main/java/org/phoebus/ui/javafx/Tracker.java

@@ -57,6 +57,9 @@ public class Tracker extends Group
     /** Enable changes? */
     protected boolean enable_changes = true;
 
+    protected int bigDeltaX = 10;
+    protected int bigDeltaY = 10;
+
     /** Create tracker */
     public Tracker()
     {
@@ -342,38 +345,41 @@ protected void handleKeyEvent(final KeyEvent event)
         final KeyCode code = event.getCode();
         boolean notify = false;
 
-        int delta = 1;
-        if (event.isShortcutDown())
-            delta = 10;
+        int delta_x = 1;
+        int delta_y = 1;
+        if (event.isShortcutDown()) {
+            delta_x = this.bigDeltaX;
+            delta_y = this.bigDeltaY;
+        }
 
         switch (code)
         {
         case UP:
             if (event.isShiftDown())
-                setPosition(tracker.getX(), tracker.getY(), tracker.getWidth(), tracker.getHeight() - delta);
+                setPosition(tracker.getX(), tracker.getY(), tracker.getWidth(), tracker.getHeight() - delta_y);
             else
-                setPosition(tracker.getX(), tracker.getY() - delta, tracker.getWidth(), tracker.getHeight());
+                setPosition(tracker.getX(), tracker.getY() - delta_y, tracker.getWidth(), tracker.getHeight());
             notify = true;
             break;
         case DOWN:
             if (event.isShiftDown())
-                setPosition(tracker.getX(), tracker.getY(), tracker.getWidth(), tracker.getHeight() + delta);
+                setPosition(tracker.getX(), tracker.getY(), tracker.getWidth(), tracker.getHeight() + delta_y);
             else
-                setPosition(tracker.getX(), tracker.getY() + delta, tracker.getWidth(), tracker.getHeight());
+                setPosition(tracker.getX(), tracker.getY() + delta_y, tracker.getWidth(), tracker.getHeight());
             notify = true;
             break;
         case LEFT:
             if (event.isShiftDown())
-                setPosition(tracker.getX(), tracker.getY(), tracker.getWidth() - delta, tracker.getHeight());
+                setPosition(tracker.getX(), tracker.getY(), tracker.getWidth() - delta_x, tracker.getHeight());
             else
-                setPosition(tracker.getX() - delta, tracker.getY(), tracker.getWidth(), tracker.getHeight());
+                setPosition(tracker.getX() - delta_x, tracker.getY(), tracker.getWidth(), tracker.getHeight());
             notify = true;
             break;
         case RIGHT:
             if (event.isShiftDown())
-                setPosition(tracker.getX(), tracker.getY(), tracker.getWidth() + delta, tracker.getHeight());
+                setPosition(tracker.getX(), tracker.getY(), tracker.getWidth() + delta_x, tracker.getHeight());
             else
-                setPosition(tracker.getX() + delta, tracker.getY(), tracker.getWidth(), tracker.getHeight());
+                setPosition(tracker.getX() + delta_x, tracker.getY(), tracker.getWidth(), tracker.getHeight());
             notify = true;
             break;
         case ESCAPE: