From 9c169fb560fc7254a8b4372f9425a49433509f2b Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Wed, 19 Sep 2018 10:46:14 +0800
Subject: [PATCH] Add a separator to separate launch button and popup button

---
 .../java/org/jackhuang/hmcl/ui/MainPage.java  |  8 ++++--
 .../hmcl/ui/decorator/DecoratorSkin.java      |  1 +
 HMCL/src/main/resources/assets/fxml/main.fxml | 28 ++++++++++---------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
index 98a55dbea..be748ec98 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
@@ -28,6 +28,7 @@ import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
@@ -61,6 +62,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
     private JFXButton btnMenu;
     @FXML
     private Label lblCurrentGame;
+    @FXML
+    private Rectangle separator;
 
     private Profile profile;
     {
@@ -74,14 +77,14 @@ public final class MainPage extends StackPane implements DecoratorPage {
         });
 
         btnLaunch.setClip(new Rectangle(-100, -100, 280, 200));
-        btnMenu.setClip(new Rectangle(180, -100, 100, 200));
+        btnMenu.setClip(new Rectangle(181, -100, 100, 200));
         menu.setMinWidth(200);
 
         StackPane graphic = new StackPane();
         Node svg = SVG.triangle(Theme.whiteFillBinding(), 10, 10);
         StackPane.setAlignment(svg, Pos.CENTER_RIGHT);
         graphic.getChildren().setAll(svg);
-        graphic.setTranslateX(11);
+        graphic.setTranslateX(12);
         btnMenu.setGraphic(graphic);
 
         Profiles.selectedVersionProperty().addListener((o, a, version) -> {
@@ -113,7 +116,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
                 .sorted((a, b) -> VersionNumber.COMPARATOR.compare(VersionNumber.asVersion(a.getId()), VersionNumber.asVersion(b.getId())))
                 .map(version -> new IconedMenuItem(null, version.getId(), () -> {
                     repository.getProfile().setSelectedVersion(version.getId());
-                    Versions.launch(repository.getProfile(), version.getId());
                     popup.hide();
                 }))
                 .collect(Collectors.toList());
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java
index f43925753..317332d2c 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java
@@ -233,6 +233,7 @@ public class DecoratorSkin extends SkinBase<DecoratorControl> {
                 Rectangle separator = new Rectangle();
                 separator.visibleProperty().bind(refreshNavButton.visibleProperty());
                 separator.heightProperty().bind(navBar.heightProperty());
+                separator.setFill(Color.GRAY);
 
                 JFXButton btnMin = new JFXButton();
                 StackPane pane = new StackPane(minus);
diff --git a/HMCL/src/main/resources/assets/fxml/main.fxml b/HMCL/src/main/resources/assets/fxml/main.fxml
index aae97d066..bd33ace52 100644
--- a/HMCL/src/main/resources/assets/fxml/main.fxml
+++ b/HMCL/src/main/resources/assets/fxml/main.fxml
@@ -4,21 +4,23 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.shape.Rectangle?>
 <fx:root type="StackPane" pickOnBounds="false"
          xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <StackPane fx:id="main" style="-fx-padding: 25;">
-        <JFXButton prefWidth="200" prefHeight="50" buttonType="RAISED" styleClass="jfx-button-raised"
-                   onMouseClicked="#launch" fx:id="btnLaunch"
-                   StackPane.alignment="BOTTOM_RIGHT">
-            <graphic>
-                <VBox alignment="CENTER" translateX="-10" maxWidth="160">
-                    <Label style="-fx-font-size: 15;" text="%version.launch" />
-                    <Label style="-fx-font-size: 10px;" fx:id="lblCurrentGame" />
-                </VBox>
-            </graphic>
-        </JFXButton>
-        <JFXButton prefWidth="200" prefHeight="50" buttonType="RAISED" styleClass="jfx-button-raised"
-                   style="-fx-font-size: 15;" onMouseClicked="#onMenu"
-                   fx:id="btnMenu" StackPane.alignment="BOTTOM_RIGHT" />
+        <StackPane maxWidth="200" maxHeight="50" StackPane.alignment="BOTTOM_RIGHT">
+            <JFXButton prefWidth="200" prefHeight="50" buttonType="RAISED" styleClass="jfx-button-raised"
+                       onMouseClicked="#launch" fx:id="btnLaunch">
+                <graphic>
+                    <VBox alignment="CENTER" translateX="-7" maxWidth="160">
+                        <Label style="-fx-font-size: 15;" text="%version.launch"/>
+                        <Label style="-fx-font-size: 10px;" fx:id="lblCurrentGame"/>
+                    </VBox>
+                </graphic>
+            </JFXButton>
+            <Rectangle fx:id="separator" translateX="80" height="52" fill="gray" width="1" mouseTransparent="true"/>
+            <JFXButton prefWidth="200" prefHeight="50" buttonType="RAISED" styleClass="jfx-button-raised"
+                       style="-fx-font-size: 15;" onMouseClicked="#onMenu" fx:id="btnMenu" />
+        </StackPane>
     </StackPane>
 </fx:root>