From 348b015bdc1de66eec4062347aaaea9684583c97 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Thu, 26 Aug 2021 17:56:20 +0200
Subject: [PATCH] reformat to use fxml to trigger resizing

---
 .../ui/mainwindow/ResizeController.java       | 26 +++++++------------
 .../resources/fxml/main_window_resize.fxml    | 16 ++++++------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
index 0d3bca915..6b0ac08fd 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
@@ -46,22 +46,6 @@ public class ResizeController implements FxController {
 	@FXML
 	public void initialize() {
 		LOG.trace("init ResizeController");
-		tlResizer.setOnMousePressed(this::startResize);
-		trResizer.setOnMousePressed(this::startResize);
-		blResizer.setOnMousePressed(this::startResize);
-		brResizer.setOnMousePressed(this::startResize);
-		tResizer.setOnMousePressed(this::startResize);
-		rResizer.setOnMousePressed(this::startResize);
-		bResizer.setOnMousePressed(this::startResize);
-		lResizer.setOnMousePressed(this::startResize);
-		tlResizer.setOnMouseDragged(this::resizeTopLeft);
-		trResizer.setOnMouseDragged(this::resizeTopRight);
-		blResizer.setOnMouseDragged(this::resizeBottomLeft);
-		brResizer.setOnMouseDragged(this::resizeBottomRight);
-		tResizer.setOnMouseDragged(this::resizeTop);
-		rResizer.setOnMouseDragged(this::resizeRight);
-		bResizer.setOnMouseDragged(this::resizeBottom);
-		lResizer.setOnMouseDragged(this::resizeLeft);
 
 		if (neverTouched()){
 			settings.displayConfigurationProperty().setValue(getMonitorSizes());
@@ -117,27 +101,33 @@ public class ResizeController implements FxController {
 		origH = window.getHeight();
 	}
 
+	@FXML
 	private void resizeTopLeft(MouseEvent evt) {
 		resizeTop(evt);
 		resizeLeft(evt);
 	}
 
+	@FXML
 	private void resizeTopRight(MouseEvent evt) {
 		resizeTop(evt);
 		resizeRight(evt);
 	}
 
+	@FXML
 	private void resizeBottomLeft(MouseEvent evt) {
 		resizeBottom(evt);
 		resizeLeft(evt);
 	}
 
+	@FXML
 	private void resizeBottomRight(MouseEvent evt) {
 		resizeBottom(evt);
 		resizeRight(evt);
 	}
 
+	@FXML
 	private void resizeTop(MouseEvent evt) {
+		startResize(evt);
 		double newY = evt.getScreenY();
 		double dy = newY - origY;
 		double newH = origH - dy;
@@ -148,7 +138,9 @@ public class ResizeController implements FxController {
 		savePositionalSettings();
 	}
 
+	@FXML
 	private void resizeLeft(MouseEvent evt) {
+		startResize(evt);
 		double newX = evt.getScreenX();
 		double dx = newX - origX;
 		double newW = origW - dx;
@@ -159,6 +151,7 @@ public class ResizeController implements FxController {
 		savePositionalSettings();
 	}
 
+	@FXML
 	private void resizeBottom(MouseEvent evt) {
 		double newH = evt.getSceneY();
 		if (newH < window.getMaxHeight() && newH > window.getMinHeight()) {
@@ -167,6 +160,7 @@ public class ResizeController implements FxController {
 		savePositionalSettings();
 	}
 
+	@FXML
 	private void resizeRight(MouseEvent evt) {
 		double newW = evt.getSceneX();
 		if (newW < window.getMaxWidth() && newW > window.getMinWidth()) {
diff --git a/src/main/resources/fxml/main_window_resize.fxml b/src/main/resources/fxml/main_window_resize.fxml
index ce491b3a6..dea6aea17 100644
--- a/src/main/resources/fxml/main_window_resize.fxml
+++ b/src/main/resources/fxml/main_window_resize.fxml
@@ -13,13 +13,13 @@
 		<Cursor fx:id="ewResize" fx:constant="E_RESIZE"/>
 	</fx:define>
 
-	<Region fx:id="tlResizer" cursor="${nwResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" AnchorPane.topAnchor="0" AnchorPane.leftAnchor="0"/>
-	<Region fx:id="trResizer" cursor="${neResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" AnchorPane.topAnchor="0" AnchorPane.rightAnchor="0"/>
-	<Region fx:id="blResizer" cursor="${neResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"/>
-	<Region fx:id="brResizer" cursor="${nwResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" AnchorPane.bottomAnchor="0" AnchorPane.rightAnchor="0"/>
-	<Region fx:id="tResizer" cursor="${nsResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="0.0"/>
-	<Region fx:id="rResizer" cursor="${ewResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="10.0"/>
-	<Region fx:id="bResizer" cursor="${nsResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0"/>
-	<Region fx:id="lResizer" cursor="${ewResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="10.0"/>
+	<Region fx:id="tlResizer" cursor="${nwResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" onMouseDragged="#resizeTopLeft"     AnchorPane.topAnchor="0"       AnchorPane.leftAnchor="0"/>
+	<Region fx:id="trResizer" cursor="${neResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" onMouseDragged="#resizeTopRight"    AnchorPane.topAnchor="0"       AnchorPane.rightAnchor="0"/>
+	<Region fx:id="blResizer" cursor="${neResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" onMouseDragged="#resizeBottomLeft"  AnchorPane.bottomAnchor="0"    AnchorPane.leftAnchor="0" />
+	<Region fx:id="brResizer" cursor="${nwResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" onMouseDragged="#resizeBottomRight" AnchorPane.bottomAnchor="0"    AnchorPane.rightAnchor="0"/>
+	<Region fx:id="tResizer"  cursor="${nsResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" onMouseDragged="#resizeTop"         AnchorPane.leftAnchor="10.0"   AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="0.0"/>
+	<Region fx:id="rResizer"  cursor="${ewResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" onMouseDragged="#resizeRight"       AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="10.0"/>
+	<Region fx:id="bResizer"  cursor="${nsResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" onMouseDragged="#resizeBottom"      AnchorPane.bottomAnchor="0.0"  AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0"/>
+	<Region fx:id="lResizer"  cursor="${ewResize}" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity" visible="${controller.showResizingArrows}" managed="${controller.showResizingArrows}" onMouseDragged="#resizeLeft"        AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="10.0"/>
 
 </AnchorPane>
\ No newline at end of file