From 957640b1ba206280609e9297d03e78b16782225f Mon Sep 17 00:00:00 2001 From: Martin Beyer Date: Tue, 24 Aug 2021 19:21:53 +0200 Subject: [PATCH] block moving and resizing in fullscreen --- .../ui/mainwindow/MainWindowTitleController.java | 2 ++ .../ui/mainwindow/ResizeController.java | 5 +++++ src/main/resources/fxml/main_window_resize.fxml | 16 ++++++++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java index b47616e29..2e68f66c5 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java @@ -73,6 +73,8 @@ public class MainWindowTitleController implements FxController { } }); titleBar.setOnMouseDragged(event -> { + //TODO should it be possible to move the window, when in fullscreen? + if (window.isFullScreen()) return; window.setX(event.getScreenX() - xOffset); window.setY(event.getScreenY() - yOffset); }); diff --git a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java index 689e24612..4e6d80187 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java @@ -152,4 +152,9 @@ public class ResizeController implements FxController { settings.windowXPositionProperty().setValue(window.getX()); } + public boolean isShowResizingArrows(){ + //If in fullscreen resizing should not be possible + return window.isFullScreen(); + } + } \ No newline at end of file diff --git a/src/main/resources/fxml/main_window_resize.fxml b/src/main/resources/fxml/main_window_resize.fxml index 27647c773..49055610d 100644 --- a/src/main/resources/fxml/main_window_resize.fxml +++ b/src/main/resources/fxml/main_window_resize.fxml @@ -14,13 +14,13 @@ - - - - - - - - + + + + + + + + \ No newline at end of file