mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

consider location of system bar when placing notification window

Browse Source 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
This commit is contained in:
Armin Schrenk
2025-12-05 15:54:05 +01:00
parent 3135be9178
commit 538e01b1e5
2 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/cryptomator/ui/common/SystemBarUtil.java Normal file
View File

@@ -0,0 +1,30 @@
package org.cryptomator.ui.common;
import ch.qos.logback.classic.filter.LevelFilter;
import javafx.stage.Screen;
public class SystemBarUtil {
public enum Placement {
LEFT,
TOP,
RIGHT,
BOTTOM;
}
public static Placement getPlacementOfSystembar(Screen screen) {
var bounds = screen.getBounds();
var vBounds = screen.getVisualBounds();
//assumption: the system bar fills a whole screen side
if(bounds.getMinX() != vBounds.getMinX()){
return Placement.LEFT;
} else if (bounds.getMinY() != vBounds.getMinY()) {
return Placement.TOP;
} else if (bounds.getMaxX() != vBounds.getMaxX()) {
return Placement.RIGHT;
} else {
return Placement.BOTTOM;
}
}
}

33
src/main/java/org/cryptomator/ui/notification/NotificationModule.java
View File

@@ -12,6 +12,7 @@ import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlLoaderFactory;
import org.cryptomator.ui.common.FxmlScene;
import org.cryptomator.ui.common.StageInitializer;
import org.cryptomator.ui.common.SystemBarUtil;
import javax.inject.Provider;
import javafx.scene.Scene;
@@ -35,24 +36,28 @@ abstract class NotificationModule {
stage.initModality(Modality.NONE);
stage.setAlwaysOnTop(true);
initializer.accept(stage);
stage.setOnShown(_ -> placeWindow(stage) );
stage.setOnShown(_ -> placeWindow(stage));
return stage;
}
//TODO: TEST
static void placeWindow(Stage window) {
if(SystemUtils.IS_OS_WINDOWS) { //place to right bottom
var screenBounds = Screen.getPrimary().getVisualBounds();
window.setX(screenBounds.getMaxX() - window.getWidth());
window.setY(screenBounds.getMaxY() - window.getHeight());
} else if(SystemUtils.IS_OS_MAC) { //place to right top
var screenBounds = Screen.getPrimary().getVisualBounds(); //TODO: TEST
window.setX(screenBounds.getMaxX() - window.getWidth());
window.setY(screenBounds.getMinY());
} else { //place to middle top
//GNOME; KDE; etc...
var screenBounds = Screen.getPrimary().getVisualBounds(); //TODO: TEST
window.setX(screenBounds.getMinX() + (screenBounds.getWidth() - window.getWidth()) / 2.0);
window.setY(screenBounds.getMinY());
var screen = Screen.getPrimary();
var vBounds = screen.getVisualBounds();
if (SystemUtils.IS_OS_MAC) { //place to right top
window.setX(vBounds.getMaxX() - window.getWidth());
window.setY(vBounds.getMinY());
} else {
switch (SystemBarUtil.getPlacementOfSystembar(screen)) {
case TOP -> {
window.setX(vBounds.getMaxX() - window.getWidth());
window.setY(vBounds.getMaxY() - window.getHeight());
}
default -> {
window.setX(vBounds.getMinX() + (vBounds.getWidth() - window.getWidth()) / 2.0);
window.setY(vBounds.getMinY());
}
}
}
}