[FEATURE] [FIX] Rebinding elements to anchor panels

GravitLauncher · Aug 25, 2024 · e848283 · e848283
1 parent ce9393d
commit e848283
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 31 deletions.
diff --git a/runtime/components/panels/leftpanel.fxml b/runtime/components/panels/leftpanel.fxml
@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 
 <AnchorPane id="leftpanel" prefWidth="300.0" stylesheets="@leftpanel.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
   <children>
-    <fx:include source="../buttons/back.fxml" AnchorPane.leftAnchor="28.0" AnchorPane.topAnchor="34.0" />
-    <Pane id="userBlock" AnchorPane.leftAnchor="74.0" AnchorPane.topAnchor="34.0">
-      <children>
-        <fx:include source="../userBlock.fxml" AnchorPane.leftAnchor="28.0" AnchorPane.topAnchor="34.0" />
-      </children>
-    </Pane>
-    <HBox alignment="CENTER" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="130.0">
-      <children>
-        <!-- Блок сервера -->
-        <Pane id="serverButton" />
-      </children>
-    </HBox>
+      <AnchorPane maxHeight="-Infinity" prefHeight="80.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+          <fx:include source="../buttons/back.fxml" AnchorPane.leftAnchor="28.0" AnchorPane.topAnchor="34.0" />
+          <Pane id="userBlock" AnchorPane.leftAnchor="74.0" AnchorPane.topAnchor="34.0">
+            <children>
+              <fx:include source="../userBlock.fxml" AnchorPane.leftAnchor="28.0" AnchorPane.topAnchor="34.0" />
+            </children>
+          </Pane>
+         </children>
+      </AnchorPane>
+      <FlowPane alignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
+         <children>
+          <HBox alignment="CENTER">
+            <children>
+              <!-- Блок сервера -->
+              <Pane id="serverButton" />
+            </children>
+          </HBox>
+         </children>
+      </FlowPane>
   </children>
-</AnchorPane>
+</AnchorPane>
diff --git a/runtime/scenes/login/login.fxml b/runtime/scenes/login/login.fxml
@@ -4,8 +4,6 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.ContextMenu?>
-<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -15,16 +13,15 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.shape.SVGPath?>
 <?import javafx.scene.text.Text?>
 
 <AnchorPane id="layout" fx:id="loginPane" prefHeight="560.0" prefWidth="930.0" styleClass="background" stylesheets="@login.css" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
 
     <!-- Вертикальная полоса -->
     <AnchorPane id="loginLeftPane" prefWidth="380.0" styleClass="vline" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
-        <VBox layoutX="35.0" layoutY="366.0" spacing="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+        <VBox alignment="CENTER" layoutX="35.0" layoutY="366.0" spacing="20.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <children>
-            <FlowPane alignment="CENTER" orientation="VERTICAL">
+            <FlowPane alignment="CENTER" maxHeight="-Infinity" minHeight="-Infinity" orientation="VERTICAL" prefHeight="320.0">
                <children>
                     <ImageView id="logo" pickOnBounds="true" preserveRatio="true">
                         <image>
@@ -33,7 +30,7 @@
                     </ImageView>
                </children>
             </FlowPane>
-                <VBox spacing="5.0">
+                <VBox spacing="10.0">
                     <children>
                         <!-- Чекбоксы -->
                         <CheckBox id="autoenter" prefHeight="18.0" prefWidth="276.0" text="%runtime.scenes.login.autoenter" wrapText="true">
@@ -51,7 +48,7 @@
                         <Insets left="20.0" />
                     </padding>
                 </VBox>
-                <ComboBox id="authList" maxWidth="1.7976931348623157E308" prefHeight="70.0" />
+                <ComboBox id="authList" maxWidth="1.7976931348623157E308" minHeight="60.0" />
             </children>
         </VBox>
     </AnchorPane>

diff --git a/runtime/scenes/serverinfo/serverinfo.fxml b/runtime/scenes/serverinfo/serverinfo.fxml
@@ -8,7 +8,7 @@
 <AnchorPane prefHeight="560.0" prefWidth="930.0" styleClass="background" stylesheets="@serverinfo.css" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
     <!-- Навбар -->
     <AnchorPane id="header" prefHeight="80.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-        <AnchorPane prefHeight="80.0" prefWidth="630.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+        <AnchorPane prefHeight="80.0" prefWidth="630.0" AnchorPane.leftAnchor="300.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <children>
                 <Label id="serverName" maxWidth="400.0" prefHeight="32.0" styleClass="scene-header" text="ServerName" AnchorPane.leftAnchor="35.0" AnchorPane.topAnchor="34.0" />
                 <!-- Кнопки управления -->
@@ -22,7 +22,7 @@
         </AnchorPane>
     </AnchorPane>
     <fx:include source="../../components/panels/leftpanel.fxml" />
-    <AnchorPane prefHeight="480.0" prefWidth="630.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
+    <AnchorPane prefHeight="480.0" prefWidth="630.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="300.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
         <children>
             <ScrollPane id="serverDescriptionPane" fitToWidth="true" hbarPolicy="NEVER" pannable="true" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0">
                 <content>

diff --git a/runtime/scenes/settings/globalsettings.fxml b/runtime/scenes/settings/globalsettings.fxml
@@ -23,7 +23,7 @@
             <fx:include source="../../components/buttons/exit.fxml" />
         </HBox>
     </AnchorPane>
-    <AnchorPane prefHeight="480.0" prefWidth="630.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
+    <AnchorPane prefHeight="480.0" prefWidth="630.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
         <children>
             <ScrollPane id="settingslist" fitToWidth="true" hbarPolicy="NEVER" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0">
                 <VBox spacing="15.0">

diff --git a/runtime/scenes/settings/settings.fxml b/runtime/scenes/settings/settings.fxml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.Slider?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.SVGPath?>
 
 <AnchorPane fx:id="layout" prefHeight="560.0" prefWidth="930.0" styleClass="background" stylesheets="@settings.css" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
     <AnchorPane id="header" prefHeight="80.0" AnchorPane.leftAnchor="300.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
@@ -23,7 +20,7 @@
         </HBox>
     </AnchorPane>
     <fx:include source="../../components/panels/leftpanel.fxml" />
-    <AnchorPane prefHeight="480.0" prefWidth="630.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
+    <AnchorPane prefHeight="480.0" prefWidth="630.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="300.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
         <children>
             <ScrollPane id="settingslist" fitToWidth="true" hbarPolicy="NEVER" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0">
                 <VBox spacing="15.0">

diff --git a/runtime/scenes/update/update.fxml b/runtime/scenes/update/update.fxml
@@ -29,9 +29,12 @@
                     <TextArea id="outputUpdate" editable="false" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                 </children>
             </AnchorPane>
+
+            <!-- Прогрессбар-->
+            <ProgressBar id="progress" prefHeight="50.0" progress="0.3" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="130.0" AnchorPane.rightAnchor="0.0" />
             <StackPane id="update-detail" prefHeight="130.0" prefWidth="130.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
                 <children>
-
+      
                     <!-- Информация-->
                     <VBox id="speedOn" alignment="CENTER">
                         <Label id="speed" alignment="CENTER" maxWidth="1.7976931348623157E308" text="214" textAlignment="CENTER">
@@ -45,9 +48,6 @@
                     <Label id="speedErr" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="speedError" text="ERR" visible="false" />
                 </children>
             </StackPane>
-
-            <!-- Прогрессбар-->
-            <ProgressBar id="progress" prefHeight="50.0" progress="0.31" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="130.0" AnchorPane.rightAnchor="0.0" />
         </children>
     </AnchorPane>
 </AnchorPane>
diff --git a/src/main/java/pro/gravit/launcher/gui/scenes/login/LoginScene.java b/src/main/java/pro/gravit/launcher/gui/scenes/login/LoginScene.java
@@ -131,6 +131,7 @@ private void getAvailabilityAuth() {
                    (auth) -> contextHelper.runInFxThread(() -> {
                        this.auth = auth.list;
                        authList.setVisible(auth.list.size() != 1);
+                       authList.setManaged(auth.list.size() != 1);
                        for (GetAvailabilityAuthRequestEvent.AuthAvailability authAvailability : auth.list) {
                            if (!authAvailability.visible) {
                                continue;