Skip to content

added shortcut (win + down) to minimize main window #34

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

Merged
Death111 merged 4 commits into from
Sep 28, 2019
Merged

added shortcut (win + down) to minimize main window #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0742eae
added shortcut (win + down) to minimize main window
Sep 2, 2019
e582637
refactored keycombination
Sep 16, 2019
d795540
Merge branch 'develop' into feature/windowsAndDownToMinimize
Death111 Sep 28, 2019
efcd862
#34 made listeners constistent
Death111 Sep 28, 2019
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
28 changes: 28 additions & 0 deletions src/main/java/de/doubleslash/keeptime/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane;
import javafx.scene.layout.Priority;
Expand Down Expand Up @@ -239,6 +243,8 @@ private void initialiseUI(final Stage primaryStage) throws IOException {
// Show the scene containing the root layout.
final Scene mainScene = new Scene(mainPane, Color.TRANSPARENT);

registerMinimizeEventlistener(mainScene, primaryStage);
registerMaximizeEventlistener(mainScene, primaryStage);
// Image(Resources.getResource(RESOURCE.ICON_MAIN).toString())); // TODO use an app icon

primaryStage.setTitle("KeepTime");
Expand All @@ -260,6 +266,28 @@ public void handle(final WindowEvent event) {

}

private void registerMinimizeEventlistener(final Scene mainScene, final Stage primaryStage) {
final KeyCombination keyComb = new KeyCodeCombination(KeyCode.DOWN, KeyCombination.META_DOWN);
mainScene.addEventFilter(KeyEvent.KEY_RELEASED, keyEvent -> {
if (keyComb.match(keyEvent)) {
LOG.info("KeyCombination '{}' was pressed: Minimizing window.", keyComb);
primaryStage.setIconified(true);
keyEvent.consume();
}
});
}

private void registerMaximizeEventlistener(final Scene mainScene, final Stage primaryStage) {
final KeyCombination keyComb = new KeyCodeCombination(KeyCode.UP, KeyCombination.META_DOWN);
mainScene.addEventFilter(KeyEvent.KEY_RELEASED, keyEvent -> {
if (keyComb.match(keyEvent)) {
LOG.info("KeyCombination '{}' was pressed: Maximizing window.", keyComb);
primaryStage.setIconified(false);
keyEvent.consume();
}
});
}

@Override
public void stop() throws Exception {
springContext.stop();
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/de/doubleslash/keeptime/view/ViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,16 +445,16 @@ private void loadSubStages() {
try {
// Report stage
final FXMLLoader fxmlLoader = createFXMLLoader(RESOURCE.FXML_REPORT);
final Parent sceneRoot = fxmlLoader.load();
sceneRoot.setFocusTraversable(true);
sceneRoot.requestFocus();
final Parent root = fxmlLoader.load();
root.setFocusTraversable(true);
root.requestFocus();
reportController = fxmlLoader.getController();
reportController.setModel(model);
reportController.setController(controller);
reportStage = new Stage();
reportStage.initModality(Modality.APPLICATION_MODAL);

final Scene reportScene = new Scene(sceneRoot);
final Scene reportScene = new Scene(root);
reportScene.setOnKeyPressed(ke -> {
if (ke.getCode() == KeyCode.ESCAPE) {
LOG.info("pressed ESCAPE");
Expand Down