From 61fd581ef5d3aac2cb382505086e45b9d812ce78 Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Tue, 7 Aug 2018 18:08:20 +0800
Subject: [PATCH] Hide the separator line between refreshNavButton and window
 buttons when refreshNavButton is hidden

---
 HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java       | 4 ++++
 HMCL/src/main/resources/assets/fxml/decorator.fxml            | 2 +-
 .../main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
index 4a3a2d28d..f11db1796 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
@@ -154,6 +154,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
     private HBox navLeft;
     @FXML
     private ImageView welcomeView;
+    @FXML
+    private Rectangle separator;
 
     public Decorator(Stage primaryStage, Node mainPage, String title) {
         this(primaryStage, mainPage, title, true, true);
@@ -190,6 +192,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
         closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), 15, 15));
         backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), 15, 15));
 
+        separator.visibleProperty().bind(refreshNavButton.visibleProperty());
+
         lblTitle.setText(title);
 
         buttonsContainer.setBackground(new Background(new BackgroundFill(Color.BLACK, CornerRadii.EMPTY, Insets.EMPTY)));
diff --git a/HMCL/src/main/resources/assets/fxml/decorator.fxml b/HMCL/src/main/resources/assets/fxml/decorator.fxml
index 059d2bf3b..fa26b7b10 100644
--- a/HMCL/src/main/resources/assets/fxml/decorator.fxml
+++ b/HMCL/src/main/resources/assets/fxml/decorator.fxml
@@ -100,7 +100,7 @@
                         <padding>
                             <Insets topRightBottomLeft="4.0"/>
                         </padding>
-                        <Rectangle height="${navBar.height}" width="1" fill="gray"/>
+                        <Rectangle fx:id="separator" height="${navBar.height}" width="1" fill="gray"/>
                         <JFXButton fx:id="btnMin" styleClass="jfx-decorator-button" ripplerFill="white"
                                    onAction="#onMin">
                         </JFXButton>
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java
index 8f95cc725..92e6d639f 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java
@@ -67,6 +67,7 @@ public class ModpackInstallTask<T> extends Task {
                 .setReplaceExistentFile(true)
                 .setFilter((destPath, isDirectory, zipEntry, entryPath) -> {
                     if (isDirectory) return true;
+                    if (!callback.test(entryPath)) return false;
                     entries.add(entryPath);
 
                     if (!files.containsKey(entryPath)) {