diff --git a/.classpath b/.classpath index a2e0bc5..cf12b2f 100644 --- a/.classpath +++ b/.classpath @@ -21,9 +21,9 @@ - + diff --git a/bin/.gitignore b/bin/.gitignore index 9eb92dc..b42b859 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1 @@ /application/ -/datatypes/ diff --git a/bin/application/Main.class b/bin/application/Main.class index 1047668..d64faad 100644 Binary files a/bin/application/Main.class and b/bin/application/Main.class differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 92cdfc9..a6ae3ed 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/bin/libraries/jfoenix-1.8.0.jar b/bin/libraries/jfoenix-1.9.1.jar similarity index 85% rename from bin/libraries/jfoenix-1.8.0.jar rename to bin/libraries/jfoenix-1.9.1.jar index 1f58fd6..c1f0147 100644 Binary files a/bin/libraries/jfoenix-1.8.0.jar and b/bin/libraries/jfoenix-1.9.1.jar differ diff --git a/src/application/Main.java b/src/application/Main.java index e7e9401..f54e35f 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -60,8 +60,8 @@ public class Main extends Application { public void start(Stage primaryStage) { this.primaryStage = primaryStage; cloudController = new CloudController(this); - initActions(); //TODO this should be called after mainWindow(), but if we do so mainAnchorPane.getWidth() is 0 mainWindow(); + initActions(); } private void mainWindow(){ @@ -140,14 +140,14 @@ public class Main extends Application { //loading settings and initialize UI, dbController.main() loads all databases mainWindowController.loadSettings(); + mainWindowController.initActions(); + mainWindowController.initUI(); mainWindowController.dbController.main(); if(mainWindowController.isCloudSync()) { cloudController.initializeConnection(mainWindowController.getCloudService(), mainWindowController.getCemuPath()); cloudController.stratupCheck(mainWindowController.getCloudService(), mainWindowController.getCemuPath()); - } + } mainWindowController.addUIData(); - mainWindowController.initActions(); - mainWindowController.initUI(); scene = new Scene(pane); //create new scene, append pane to scene scene.getStylesheets().add(Main.class.getResource("MainWindows.css").toExternalForm()); diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 71fa69c..dab22e8 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -1303,7 +1303,9 @@ public class MainWindowController { xPos = xPos + 217; xPosHelper++; } -// System.out.println("Breit: " + mainAnchorPane.getPrefWidth()); + + System.out.println("Breit: " + mainAnchorPane.getPrefWidth()); + System.out.println("Breit2: " + mainAnchorPane.getWidth()); // System.out.println("xPosHelper: " + xPosHelper); // System.out.println("yPos: " + yPos); // System.out.println("xPos: " + xPos); diff --git a/src/libraries/jfoenix-1.8.0.jar b/src/libraries/jfoenix-1.9.1.jar similarity index 85% rename from src/libraries/jfoenix-1.8.0.jar rename to src/libraries/jfoenix-1.9.1.jar index 1f58fd6..c1f0147 100644 Binary files a/src/libraries/jfoenix-1.8.0.jar and b/src/libraries/jfoenix-1.9.1.jar differ