Refac

Author: armin-reichert

pacman-ui/src/main/java/de/amr/pacmanfx/ui/GameUI_Implementation.java

@@ -427,7 +427,7 @@ public void selectGameVariant(String gameVariant) {
             Logger.error("Could not find app icon for current game variant {}", gameVariant);
         }
 
-        playView().canvasFrame().roundedBorderProperty().set(newConfig.hasGameCanvasRoundedBorder());
+        playView().canvasFrame().setRoundedBorder(newConfig.hasGameCanvasRoundedBorder());
 
         // this triggers a game event and the event handlers:
         gameContext.theGameController().selectGameVariant(gameVariant);

pacman-ui/src/main/java/de/amr/pacmanfx/ui/_2d/CanvasWithFrame.java

@@ -28,7 +28,7 @@ public class CanvasWithFrame extends BorderPane {
 
     private final ObjectProperty<Color> borderColor = new SimpleObjectProperty<>(Color.LIGHTBLUE);
 
-    private final BooleanProperty roundedBorderPy = new SimpleBooleanProperty(true) {
+    private final BooleanProperty roundedBorder = new SimpleBooleanProperty(true) {
         @Override
         protected void invalidated() {
             doLayout(scaling(), true);
@@ -77,7 +77,7 @@ public CanvasWithFrame() {
                 clipRect.setArcHeight(arcSize);
             }
             return clipRect;
-        }, roundedBorderPy, scaling, unscaledCanvasWidth, unscaledCanvasHeight));
+        }, roundedBorder, scaling, unscaledCanvasWidth, unscaledCanvasHeight));
 
         borderProperty().bind(Bindings.createObjectBinding(() -> {
             if (!hasRoundedBorder() || !isBorderVisible()) {
@@ -86,7 +86,7 @@ public CanvasWithFrame() {
             double bw = Math.max(5, Math.ceil(computeSize().getHeight() / 55)); // TODO avoid magic numbers
             CornerRadii cr = hasRoundedBorder() ? new CornerRadii(Math.ceil(10 * scaling())) : null;
             return new Border(new BorderStroke(borderColor(), BorderStrokeStyle.SOLID, cr, new BorderWidths(bw)));
-        }, roundedBorderPy, borderVisible, scaling, unscaledCanvasWidth, unscaledCanvasHeight));
+        }, roundedBorder, borderVisible, scaling, unscaledCanvasWidth, unscaledCanvasHeight));
     }
 
     private void doLayout(double newScaling, boolean forced) {
@@ -121,10 +121,6 @@ private Dimension2D computeSize() {
         );
     }
 
-    public Canvas canvas() {
-        return canvas;
-    }
-
     public void resizeTo(double width, double height) {
         if (hasRoundedBorder()) {
             double downScaledWidth = width, downScaledHeight = height;
@@ -143,6 +139,10 @@ public void resizeTo(double width, double height) {
         Logger.debug("Game canvas container resized to width={} height={}", getWidth(), getHeight());
     }
 
+    public Canvas canvas() {
+        return canvas;
+    }
+
     public DoubleProperty scalingProperty() { return scaling; }
     public double scaling() {
         return scaling.get();
@@ -167,24 +167,28 @@ public void setUnscaledCanvasSize(double width, double height) {
         unscaledCanvasHeight.set(height);
     }
 
-    public BooleanProperty roundedBorderProperty() { return roundedBorderPy; }
+    public BooleanProperty roundedBorderProperty() { return roundedBorder; }
+
     public boolean hasRoundedBorder() {
-        return roundedBorderPy.get();
+        return roundedBorder.get();
     }
+
     public void setRoundedBorder(boolean enabled) {
-        roundedBorderPy.set(enabled);
+        roundedBorder.set(enabled);
     }
 
     public Color borderColor() {
         return borderColor.get();
     }
+
     public void setBorderColor(Color color) {
         borderColor.set(color);
     }
 
     public boolean isBorderVisible() {
         return borderVisible.get();
     }
+
     public void setBorderVisible(boolean visible) {
         borderVisible.set(visible);
     }