diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index 483e49e6..109112c2 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -1,4 +1,4 @@ -var authPane, dimPane, serverPane, bar, consoleBar, optionsPane, consolePane; +var authPane, dimPane, serverPane, bar, consoleBar, optionsPane, consolePane, loginPaneLayout, serverPaneLayout; var loginField, passwordField, savePasswordBox, authOptions; var serverList, serverInfo, serverDescription, serverEntrance, serverLabel, serverStatus; var profilesList = []; @@ -43,6 +43,9 @@ function initLoginScene() { var pane = loginPane.lookup("#authPane"); authPane = pane; + var loginLayout = loginPane.lookup("#layout"); + loginPaneLayout = loginLayout; + loginField = pane.lookup("#login"); loginField.setOnMouseMoved(function(event){rootPane.fireEvent(event)}); loginField.setOnAction(goAuth); @@ -93,6 +96,9 @@ function initMenuScene() { var pane = menuPane.lookup("#serverPane"); serverPane = pane; + var menuLayout = menuPane.lookup("#layout"); + serverPaneLayout = menuLayout; + pane.lookup("#clientSettings").setOnAction(goOptions); serverList = pane.lookup("#serverlist").getContent(); serverInfo = pane.lookup("#serverinfo").getContent(); @@ -258,6 +264,7 @@ function verifyLauncher(e) { authTypes[auth_type.displayName] = auth_type.name; iter++; }); + authOptions.getSelectionModel().select(0); var sm = authOptions.getSelectionModel().selectedIndexProperty(); // add listener to authOptions select sm.addListener(new javafx.beans.value.ChangeListener({ @@ -416,7 +423,8 @@ var overlay = { dimPane.setVisible(true); dimPane.toFront(); - + loginPaneLayout.setEffect(new javafx.scene.effect.GaussianBlur(55)); + serverPaneLayout.setEffect(new javafx.scene.effect.GaussianBlur(55)); fade(dimPane, 0.0, 0.0, 1.0, function(event) { dimPane.requestFocus(); dimPane.getChildren().add(newOverlay); @@ -436,7 +444,8 @@ var overlay = { authPane.setDisable(false); rootPane.requestFocus(); - + loginPaneLayout.setEffect(new javafx.scene.effect.GaussianBlur(0)); + serverPaneLayout.setEffect(new javafx.scene.effect.GaussianBlur(0)); overlay.current = null; if (onFinished !== null) { onFinished(); diff --git a/Launcher/runtime/dialog/scenes/login/login.fxml b/Launcher/runtime/dialog/scenes/login/login.fxml index fe5c2c58..60911da0 100644 --- a/Launcher/runtime/dialog/scenes/login/login.fxml +++ b/Launcher/runtime/dialog/scenes/login/login.fxml @@ -14,45 +14,49 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - diff --git a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml index 6b187622..dc776aad 100644 --- a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml +++ b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml @@ -13,94 +13,98 @@ - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index 69a98032..574e979a 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -3,6 +3,7 @@ Button, CheckBox, ComboBox, RadioButton { -fx-cursor: hand; } + /* Backgrounds */ #layout { -fx-background-color: transparent; @@ -32,7 +33,7 @@ #serverStatus{ /* Mask */ #mask { - -fx-background-color: rgba(0, 0, 0, 0.5); + -fx-effect: DropShadow( gaussian , rgba(255,255,255,0.5) , 0,0,0,1 ); -fx-pref-width: 692px; -fx-pref-height: 450px; }