CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-07-02 13:00:48 +12:00
Code Issues Packages Projects Releases Wiki Activity

Window centering improvements

Browse source
This commit is contained in:
crschnick 2024-05-14 08:53:12 +00:00
parent d77925540e
commit 6dd0e6d255
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/xpipe/app/core/AppMainWindow.java
View file

@ -146,6 +146,8 @@ public class AppMainWindow {
AtomicBoolean shown = new AtomicBoolean(false); AtomicBoolean shown = new AtomicBoolean(false);
stage.setOnShown(event -> { stage.setOnShown(event -> {
PlatformThread.runLaterIfNeeded(() -> { PlatformThread.runLaterIfNeeded(() -> {
// On some platforms, e.g. KDE with wayland, the screen size is not known when the window is first shown
// This fixes the alignment in these cases
if (state == null && !shown.get()) { if (state == null && !shown.get()) {
Platform.runLater(() -> { Platform.runLater(() -> {
stage.centerOnScreen(); stage.centerOnScreen();

15
app/src/main/java/io/xpipe/app/core/AppWindowHelper.java
View file

@ -85,12 +85,14 @@ public class AppWindowHelper {
stage.setOnShown(e -> { stage.setOnShown(e -> {
AppTheme.initThemeHandlers(stage); AppTheme.initThemeHandlers(stage);
centerToMainWindow(stage); Platform.runLater(() -> {
clampWindow(stage).ifPresent(rectangle2D -> { centerToMainWindow(stage);
stage.setX(rectangle2D.getMinX()); clampWindow(stage).ifPresent(rectangle2D -> {
stage.setY(rectangle2D.getMinY()); stage.setX(rectangle2D.getMinX());
stage.setWidth(rectangle2D.getWidth()); stage.setY(rectangle2D.getMinY());
stage.setHeight(rectangle2D.getHeight()); stage.setWidth(rectangle2D.getWidth());
stage.setHeight(rectangle2D.getHeight());
});
}); });
}); });
return stage; return stage;
@ -98,6 +100,7 @@ public class AppWindowHelper {
private static void centerToMainWindow(Window childStage) { private static void centerToMainWindow(Window childStage) {
if (App.getApp() == null) { if (App.getApp() == null) {
childStage.centerOnScreen();
return; return;
} }