[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix window decorations #11440

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
+33 −48
Draft

Fix window decorations #11440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
61c4325
Fix window decorations
calixtus Jun 30, 2024
dabdf99
Enable debug log
koppor Jul 1, 2024
e56f2d9
Check all screens
koppor Jul 1, 2024
536c38d
Debug output screens
koppor Jul 1, 2024
8fdcade
Always save new window position
koppor Jul 1, 2024
dcf2e57
Save window state after fixing it
koppor Jul 1, 2024
0a233a5
Fix casing
koppor Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions src/main/java/org/jabref/gui/JabRefGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import javafx.application.Application;
import javafx.application.Platform;
import javafx.geometry.Rectangle2D;
import javafx.scene.Scene;
import javafx.scene.input.KeyEvent;
import javafx.stage.Screen;
Expand Down Expand Up @@ -66,7 +67,6 @@ public class JabRefGUI extends Application {

private static RemoteListenerServerManager remoteListenerServerManager;

private boolean correctedWindowPos = false;
private Stage mainStage;

public static void setup(List<UiCommand> uiCommands,
Expand Down Expand Up @@ -184,22 +184,29 @@ private void openWindow() {

mainStage.setMinHeight(330);
mainStage.setMinWidth(580);
mainStage.setFullScreen(guiPreferences.isWindowFullscreen());
mainStage.setMaximized(guiPreferences.isWindowMaximised());
if ((Screen.getScreens().size() == 1) && isWindowPositionOutOfBounds()) {
// corrects the Window, if it is outside the mainscreen
LOGGER.debug("The Jabref window is outside the main screen");
mainStage.setX(0);
mainStage.setY(0);
mainStage.setWidth(1024);
mainStage.setHeight(768);
correctedWindowPos = true;
// maximized target state is stored, because "saveWindowState" saves x and y only if not maximized
boolean windowMaximised = guiPreferences.isWindowMaximised();

LOGGER.debug("Screens: {}", Screen.getScreens());
debugLogWindowState(mainStage);

if (isWindowPositionOutOfBounds()) {
LOGGER.debug("The JabRef window is outside of screen bounds. Position and size will be corrected. Main screen will be used.");
Rectangle2D bounds = Screen.getPrimary().getBounds();
mainStage.setX(bounds.getMinX());
mainStage.setY(bounds.getMinY());
mainStage.setHeight(Math.min(bounds.getHeight(), 786.0));
mainStage.setWidth(Math.min(bounds.getWidth(), 1024.0));
saveWindowState();
} else {
LOGGER.debug("The JabRef window is inside screen bounds.");
mainStage.setX(guiPreferences.getPositionX());
mainStage.setY(guiPreferences.getPositionY());
mainStage.setWidth(guiPreferences.getSizeX());
mainStage.setHeight(guiPreferences.getSizeY());
}
// after calling "saveWindowState" the maximized state can be set
mainStage.setMaximized(windowMaximised);
debugLogWindowState(mainStage);

Scene scene = new Scene(JabRefGUI.mainFrame);
Expand Down Expand Up @@ -239,26 +246,20 @@ public void onCloseRequest(WindowEvent event) {
}

public void onHiding(WindowEvent event) {
if (!correctedWindowPos) {
// saves the window position only if its not corrected -> the window will rest at the old Position,
// if the external Screen is connected again.
saveWindowState();
}

saveWindowState();
preferencesService.flush();

// Goodbye!
Platform.exit();
}

private void saveWindowState() {
GuiPreferences preferences = preferencesService.getGuiPreferences();
preferences.setPositionX(mainStage.getX());
preferences.setPositionY(mainStage.getY());
preferences.setSizeX(mainStage.getWidth());
preferences.setSizeY(mainStage.getHeight());
if (!mainStage.isMaximized()) {
preferences.setPositionX(mainStage.getX());
preferences.setPositionY(mainStage.getY());
preferences.setSizeX(mainStage.getWidth());
preferences.setSizeY(mainStage.getHeight());
}
preferences.setWindowMaximised(mainStage.isMaximized());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would drop this line, too.

This should keep the fix at #4939

preferences.setWindowFullScreen(mainStage.isFullScreen());
debugLogWindowState(mainStage);
}

Expand All @@ -281,13 +282,14 @@ private void debugLogWindowState(Stage mainStage) {

/**
* Tests if the window coordinates are out of the mainscreen
*
* @return outbounds
*/
private boolean isWindowPositionOutOfBounds() {
return !Screen.getPrimary().getBounds().contains(
preferencesService.getGuiPreferences().getPositionX(),
preferencesService.getGuiPreferences().getPositionY());
// The upper right corner is checked as there are most probably the window controls.
GuiPreferences guiPreferences = preferencesService.getGuiPreferences();
double rightX = guiPreferences.getPositionX() + guiPreferences.getSizeX();
double topY = guiPreferences.getPositionY();
return Screen.getScreens().stream().noneMatch((screen -> screen.getBounds().contains(
rightX, topY)));
}

// Background tasks
Expand Down
15 changes: 0 additions & 15 deletions src/main/java/org/jabref/preferences/GuiPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class GuiPreferences {
private final DoubleProperty sizeY;

private final BooleanProperty windowMaximised;
private final BooleanProperty windowFullScreen;

// the last libraries that were open when jabref closes and should be reopened on startup
private final ObservableList<Path> lastFilesOpened;
Expand All @@ -39,7 +38,6 @@ public GuiPreferences(double positionX,
double sizeX,
double sizeY,
boolean windowMaximised,
boolean windowFullScreen,
List<Path> lastFilesOpened,
Path lastFocusedFile,
FileHistory fileHistory,
Expand All @@ -50,7 +48,6 @@ public GuiPreferences(double positionX,
this.sizeX = new SimpleDoubleProperty(sizeX);
this.sizeY = new SimpleDoubleProperty(sizeY);
this.windowMaximised = new SimpleBooleanProperty(windowMaximised);
this.windowFullScreen = new SimpleBooleanProperty(windowFullScreen);
this.lastFilesOpened = FXCollections.observableArrayList(lastFilesOpened);
this.lastFocusedFile = new SimpleObjectProperty<>(lastFocusedFile);
this.lastSelectedIdBasedFetcher = new SimpleStringProperty(lastSelectedIdBasedFetcher);
Expand Down Expand Up @@ -118,18 +115,6 @@ public void setWindowMaximised(boolean windowMaximised) {
this.windowMaximised.set(windowMaximised);
}

public BooleanProperty windowFullScreenProperty() {
return windowFullScreen;
}

public void setWindowFullScreen(boolean windowFullScreen) {
this.windowFullScreen.set(windowFullScreen);
}

public boolean isWindowFullscreen() {
return windowFullScreen.get();
}

public ObservableList<Path> getLastFilesOpened() {
return lastFilesOpened;
}
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/org/jabref/preferences/JabRefPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ public class JabRefPreferences implements PreferencesService {
public static final String ENTRY_EDITOR_PREVIEW_DIVIDER_POS = "entryEditorPreviewDividerPos";
public static final String AUTO_RESIZE_MODE = "autoResizeMode";
public static final String WINDOW_MAXIMISED = "windowMaximised";
public static final String WINDOW_FULLSCREEN = "windowFullscreen";

public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport";
public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder";
Expand Down Expand Up @@ -603,7 +602,6 @@ private JabRefPreferences() {
defaults.put(SIZE_X, 1024);
defaults.put(SIZE_Y, 768);
defaults.put(WINDOW_MAXIMISED, Boolean.TRUE);
defaults.put(WINDOW_FULLSCREEN, Boolean.FALSE);
defaults.put(AUTO_RESIZE_MODE, Boolean.FALSE); // By default disable "Fit table horizontally on the screen"
defaults.put(ENTRY_EDITOR_HEIGHT, 0.65);
defaults.put(ENTRY_EDITOR_PREVIEW_DIVIDER_POS, 0.5);
Expand Down Expand Up @@ -2572,7 +2570,6 @@ public GuiPreferences getGuiPreferences() {
getDouble(SIZE_X),
getDouble(SIZE_Y),
getBoolean(WINDOW_MAXIMISED),
getBoolean(WINDOW_FULLSCREEN),
getStringList(LAST_EDITED).stream()
.map(Path::of)
.collect(Collectors.toList()),
Expand All @@ -2586,7 +2583,6 @@ public GuiPreferences getGuiPreferences() {
EasyBind.listen(guiPreferences.sizeXProperty(), (obs, oldValue, newValue) -> putDouble(SIZE_X, newValue.doubleValue()));
EasyBind.listen(guiPreferences.sizeYProperty(), (obs, oldValue, newValue) -> putDouble(SIZE_Y, newValue.doubleValue()));
EasyBind.listen(guiPreferences.windowMaximisedProperty(), (obs, oldValue, newValue) -> putBoolean(WINDOW_MAXIMISED, newValue));
EasyBind.listen(guiPreferences.windowFullScreenProperty(), (obs, oldValue, newValue) -> putBoolean(WINDOW_FULLSCREEN, newValue));
guiPreferences.getLastFilesOpened().addListener((ListChangeListener<Path>) change -> {
if (change.getList().isEmpty()) {
prefs.remove(LAST_EDITED);
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/tinylog.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ exception = strip: jdk.internal
level@org.jabref.gui.maintable.PersistenceVisualStateTable = debug

level@org.jabref.http.server.Server = debug

level@org.jabref.gui.JabRefGUI = debug