zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Improve Scene Switching #109

Merged
kske merged 5 commits from improved-scene-switching into develop 2020-11-22 11:19:42 +01:00
Conversation 5 Commits 5 Files Changed 10 +12 -5
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d4865570d - Show all commits

5
client/src/main/java/envoy/client/ui/SceneContext.java
View File

@@ -77,11 +77,8 @@ public final class SceneContext implements EventListener {
scene.getAccelerators() scene.getAccelerators()
.putAll(((KeyboardMapping) controller).getKeyboardShortcuts()); .putAll(((KeyboardMapping) controller).getKeyboardShortcuts());
// The LoginScene is the only scene not intended to be resized Platform.runLater(() -> stage.setResizable(sceneInfo.resizable));
// As strange as it seems, this is needed as otherwise the LoginScene won't be
// displayed on some OS (...Debian...)
stage.sizeToScene(); stage.sizeToScene();
Platform.runLater(() -> stage.setResizable(sceneInfo != SceneInfo.LOGIN_SCENE));
applyCSS(); applyCSS();
stage.show(); stage.show();
} catch (final IOException e) { } catch (final IOException e) {

12
client/src/main/java/envoy/client/ui/SceneInfo.java
View File

@@ -27,14 +27,24 @@ public enum SceneInfo {
* *
* @since Envoy Client v0.1-beta * @since Envoy Client v0.1-beta
*/ */
LOGIN_SCENE("/fxml/LoginScene.fxml"); LOGIN_SCENE("/fxml/LoginScene.fxml", false);
/** /**
* The path to the FXML resource. * The path to the FXML resource.
*/ */
public final String path; public final String path;
/**
* Whether the scene should be resizable.
*/
public final boolean resizable;
SceneInfo(String path) { SceneInfo(String path) {
this(path, true);
}
SceneInfo(String path, boolean resizable) {
this.path = path; this.path = path;
this.resizable = resizable;
} }
} }