From c5ec2cf3e13a3b8640491666e942d07890d85beb Mon Sep 17 00:00:00 2001
From: Gravit <gravit.min@ya.ru>
Date: Sat, 10 Nov 2018 21:18:14 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=BE=D1=82=20DrLeonardo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Launcher/runtime/dialog/dialog.js             | 11 +++---
 .../runtime/dialog/overlay/debug/debug.css    |  2 --
 .../dialog/overlay/options/options.fxml       | 23 ++++++++-----
 .../runtime/dialog/overlay/options/options.js |  4 +--
 .../dialog/overlay/settings/settings.fxml     | 34 ++++++++++++-------
 .../dialog/overlay/settings/settings.js       | 19 +++++++----
 6 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index 9bd80975..2ca9cf9d 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -278,10 +278,13 @@ function updateProfilesList(profiles) {
     profiles.forEach(function (profile, i, arr) {
         pingers[profile.object] = new ServerPinger(profile.object.getServerSocketAddress(), profile.object.getVersion());
         var serverBtn = new javafx.scene.control.ToggleButton(profile);
-        profilesList[serverBtn] = profile;
-        serverBtn.setOnAction(function (event) {
-            serverHolder.set(serverBtn);
-        });
+        (function () {
+            profilesList[serverBtn] = profile;
+            var hold = serverBtn;
+            serverBtn.setOnAction(function (event) {
+                serverHolder.set(hold);
+            });
+        })();
         serverList.getChildren().add(serverBtn);
     });
     serverHolder.set(serverList.getChildren().get(0));
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.css b/Launcher/runtime/dialog/overlay/debug/debug.css
index b4a3e994..ccfc28be 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.css
+++ b/Launcher/runtime/dialog/overlay/debug/debug.css
@@ -1,5 +1,3 @@
-@import url(../../styles/common.css);
-
 /* Output */
 #overlay > #output {
     -fx-background-color: white;
diff --git a/Launcher/runtime/dialog/overlay/options/options.fxml b/Launcher/runtime/dialog/overlay/options/options.fxml
index 46c708a4..9149061a 100644
--- a/Launcher/runtime/dialog/overlay/options/options.fxml
+++ b/Launcher/runtime/dialog/overlay/options/options.fxml
@@ -3,8 +3,9 @@
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
 
 <!-- DrLeonardo Design -->
 
@@ -12,14 +13,18 @@
    <children>
      <Pane id="holder" layoutX="171.0" layoutY="28.0" prefHeight="371.0" prefWidth="428.0">
        <children>
-            <FlowPane id="modlist" orientation="VERTICAL" prefHeight="371.0">
-                <children>
-                </children>
-               <padding>
-                  <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-               </padding>
-            </FlowPane>
-           <Button fx:id="apply" defaultButton="true" layoutX="315.0" layoutY="333.0" prefHeight="25.0" prefWidth="100.0" text="Применить" />
+        <ScrollPane id="modlist" hbarPolicy="NEVER">
+               <content>
+                  <VBox prefHeight="370.0" prefWidth="428.0">
+					<children>
+					</children>
+                     <padding>
+                        <Insets left="10.0" top="8.0" />
+                     </padding>
+				  </VBox>
+               </content>
+        </ScrollPane>
+		<Button fx:id="apply" defaultButton="true" layoutX="318.0" layoutY="336.0" prefHeight="25.0" prefWidth="100.0" text="Применить" />
         </children>
      </Pane>
    </children>
diff --git a/Launcher/runtime/dialog/overlay/options/options.js b/Launcher/runtime/dialog/overlay/options/options.js
index 6e72f6be..5ad2fc0e 100644
--- a/Launcher/runtime/dialog/overlay/options/options.js
+++ b/Launcher/runtime/dialog/overlay/options/options.js
@@ -45,7 +45,7 @@ var options = {
 };
 function updateOptional()
 {
-    var holder = options.overlay.lookup("#modlist");
+    var holder = options.overlay.lookup("#modlist").getContent();
     var nodelist = new java.util.ArrayList;
     
     holder.getChildren().forEach(function(node,i,arr) {
@@ -62,8 +62,6 @@ function updateOptional()
          var testMod = new javafx.scene.control.CheckBox(modfile.string);
 
          testMod.setSelected(modfile.mark);
-         //testMod.setLayoutY(2+3*i);
-         //testMod.setLayoutX(2);
          testMod.setOnAction(function(event) {
              var isSelected = event.getSource().isSelected();
              if(isSelected)
diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml
index 8655ab3f..1bc40df3 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.fxml
+++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml
@@ -4,7 +4,6 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.Slider?>
 <?import javafx.scene.layout.Pane?>
@@ -19,27 +18,36 @@
      <Pane id="holder" layoutX="1.0" layoutY="28.0" prefHeight="371.0" prefWidth="598.0">
        <children>
          <CheckBox fx:id="autoEnter" layoutX="14.0" layoutY="80.0" text="Автовход на сервер" />
+			<Text fill="#8c8c8c" layoutX="38.0" layoutY="95.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="533.0000102519989" y="15.0" />
          <CheckBox fx:id="fullScreen" layoutX="13.0" layoutY="185.0" text="Клиент в полный экран" />
+            <Text fill="#8c8c8c" layoutX="38.0" layoutY="200.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="533.0000102519989" y="15.0" />
+         <CheckBox id="debug" layoutX="13.0" layoutY="124.0" text="Режим Откладки" />
+			<Text fill="#8c8c8c" layoutX="38.0" layoutY="139.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="533.0000016447157" y="15.0" />
 		 
          <!-- RAM settings -->
-		 <TextFlow layoutX="20.0" layoutY="70.0" />
-		 <Slider fx:id="ramSlider" layoutX="18.0" layoutY="36.0" prefHeight="3.0" prefWidth="563.0" />
-		 <Separator layoutY="65.0" prefHeight="1.0" prefWidth="600.0" />
-         <Label id="" alignment="CENTER_LEFT" layoutX="18.0" layoutY="16.0" prefHeight="17.0" prefWidth="217.0" text="Лимит памяти для клиента ОЗУ (RAM)" textFill="#2f2f2f" />
+		<TextFlow layoutX="128.0" layoutY="6.0">
+			<Text fx:id="ramLabel" />
+		</TextFlow>
+		 <Slider fx:id="ramSlider" layoutX="18.0" layoutY="26.0" prefHeight="3.0" prefWidth="563.0" />
+		 <Separator layoutY="65.0" prefHeight="1.0" prefWidth="598.0" />
          <!-- RAM settings -->
 		 
+         <!-- Deldir settings -->
          <Button fx:id="deleteDir" layoutX="15.0" layoutY="333.0" prefHeight="25.0" prefWidth="245.0" text="Очистить данные игровых клиентов" textAlignment="CENTER" wrapText="true">
-               <font>
-                  <Font name="System Bold" size="12.0" />
-               </font></Button>
+            <font>
+               <Font name="System Bold" size="12.0" />
+            </font>
+		 </Button>
+         <!-- Deldir settings -->
+		 
+         <!-- Changedir settings -->
          <Button fx:id="changeDir" layoutX="14.0" layoutY="229.0" prefHeight="25.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
          <Hyperlink id="dirLabel" alignment="TOP_LEFT" layoutX="215.0" layoutY="230.0" prefHeight="23.0" prefWidth="371.0" text="C:/Users" wrapText="true" />
+         <!-- Changedir settings -->
+		 
          <Button fx:id="apply" defaultButton="true" layoutX="486.0" layoutY="335.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
-         <CheckBox id="debug" layoutX="13.0" layoutY="124.0" text="Режим Откладки" />
-            <Text fill="#8c8c8c" layoutX="38.0" layoutY="95.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="533.0000102519989" y="15.0" />
-            <Text fill="#8c8c8c" layoutX="38.0" layoutY="139.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="533.0000016447157" y="15.0" />
-            <Text fill="#8c8c8c" layoutX="38.0" layoutY="200.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="533.0000102519989" y="15.0" />
-			<Label fx:id="ramLabel" alignment="CENTER_RIGHT" layoutX="481.0" layoutY="17.0" prefWidth="100.0" text="RAM" />
+			<Text layoutX="17.0" layoutY="19.0">Выделение памяти: </Text>
+
        </children>
      </Pane>
    </children>
diff --git a/Launcher/runtime/dialog/overlay/settings/settings.js b/Launcher/runtime/dialog/overlay/settings/settings.js
index b65c79b5..d4225b39 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.js
+++ b/Launcher/runtime/dialog/overlay/settings/settings.js
@@ -24,9 +24,16 @@ var settingsClass = Java.extend(LauncherSettingsClass.static, {
         var encrypted = SecurityHelper.newRSAEncryptCipher(Launcher.getConfig().publicKey).doFinal(IOHelper.encode(password));
         //settings.password = encrypted;
         return encrypted;
-    }
+    },
 
 
+    setRAM: function(ram) {
+		if (ram>762&&ram<1024){
+        settings.ram = java.lang.Math["min(int,int)"](ram, JVMHelper.RAM);
+		}else{
+        settings.ram = java.lang.Math["min(int,int)"](((ram / 256) | 0) * 256, JVMHelper.RAM);
+		}
+    },
 });
 var settingsOverlay = {
 /* ===================== OVERLAY ===================== */
@@ -64,7 +71,6 @@ var settingsOverlay = {
             }
         });
 
-
         // Lookup fullScreen checkbox
         var fullScreenBox = holder.lookup("#fullScreen");
         fullScreenBox.setSelected(settings.fullScreen);
@@ -77,16 +83,17 @@ var settingsOverlay = {
 
         // Lookup RAM slider options
         var ramSlider = holder.lookup("#ramSlider");
-        ramSlider.setMin(0);
         ramSlider.setMax(JVMHelper.RAM);
         ramSlider.setSnapToTicks(true);
+        ramSlider.setShowTickMarks(true);
+        ramSlider.setShowTickLabels(true);
         ramSlider.setMinorTickCount(3);
-        //ramSlider.setMajorTickUnit(1024);
-        //ramSlider.setBlockIncrement(1024);
+        ramSlider.setMajorTickUnit(1024);
+        ramSlider.setBlockIncrement(1024);
         ramSlider.setValue(settings.ram);
         ramSlider.valueProperty()["addListener(javafx.beans.value.ChangeListener)"](function(o, ov, nv) {
             settings.setRAM(nv);
-            settingsOverlay.updateRAMLabel();
+            settings.updateRAMLabel();
         });
 
         // Lookup delete dir button