lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide the separator line between refreshNavButton and window buttons when refreshNavButton is hidden

Browse Source
This commit is contained in:
huanghongxun
2018-08-07 18:08:20 +08:00
parent 51afcf2dee
commit 61fd581ef5
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
View File

@@ -154,6 +154,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
private HBox navLeft; private HBox navLeft;
@FXML @FXML
private ImageView welcomeView; private ImageView welcomeView;
@FXML
private Rectangle separator;
public Decorator(Stage primaryStage, Node mainPage, String title) { public Decorator(Stage primaryStage, Node mainPage, String title) {
this(primaryStage, mainPage, title, true, true); 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)); closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), 15, 15));
backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), 15, 15)); backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), 15, 15));
separator.visibleProperty().bind(refreshNavButton.visibleProperty());
lblTitle.setText(title); lblTitle.setText(title);
buttonsContainer.setBackground(new Background(new BackgroundFill(Color.BLACK, CornerRadii.EMPTY, Insets.EMPTY))); buttonsContainer.setBackground(new Background(new BackgroundFill(Color.BLACK, CornerRadii.EMPTY, Insets.EMPTY)));

2
HMCL/src/main/resources/assets/fxml/decorator.fxml
View File

@@ -100,7 +100,7 @@
<padding> <padding>
<Insets topRightBottomLeft="4.0"/> <Insets topRightBottomLeft="4.0"/>
</padding> </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" <JFXButton fx:id="btnMin" styleClass="jfx-decorator-button" ripplerFill="white"
onAction="#onMin"> onAction="#onMin">
</JFXButton> </JFXButton>

1
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java
View File

@@ -67,6 +67,7 @@ public class ModpackInstallTask<T> extends Task {
.setReplaceExistentFile(true) .setReplaceExistentFile(true)
.setFilter((destPath, isDirectory, zipEntry, entryPath) -> { .setFilter((destPath, isDirectory, zipEntry, entryPath) -> {
if (isDirectory) return true; if (isDirectory) return true;
if (!callback.test(entryPath)) return false;
entries.add(entryPath); entries.add(entryPath);
if (!files.containsKey(entryPath)) { if (!files.containsKey(entryPath)) {