From a237ca799f951bdd61e318e4e68bf36cdeb34877 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Wed, 14 Feb 2018 00:34:50 +0800 Subject: [PATCH] Fixed darker color of title bar --- HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java | 6 ++++++ HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java | 2 ++ 2 files changed, 8 insertions(+) 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 93710e7bf..4fdf822c5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java @@ -24,6 +24,7 @@ import com.jfoenix.controls.JFXHamburger; import com.jfoenix.effects.JFXDepthManager; import com.jfoenix.svg.SVGGlyph; import javafx.application.Platform; +import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -41,6 +42,7 @@ import javafx.scene.image.Image; import javafx.scene.input.MouseEvent; import javafx.scene.layout.*; import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; import javafx.stage.Screen; import javafx.stage.Stage; import javafx.stage.StageStyle; @@ -171,6 +173,10 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza titleContainer.addEventHandler(MouseEvent.MOUSE_EXITED, e -> { if (!isDragging) allowMove = false; }); + Rectangle rectangle = new Rectangle(0, 0, 0, 0); + rectangle.widthProperty().bind(titleContainer.widthProperty()); + rectangle.heightProperty().bind(Bindings.createDoubleBinding(() -> titleContainer.getHeight() + 100, titleContainer.heightProperty())); + titleContainer.setClip(rectangle); animationHandler = new TransitionHandler(contentPlaceHolder); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java index e441e657a..04d614b17 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java @@ -139,6 +139,7 @@ public final class SettingsPage extends StackPane implements DecoratorPage { FXUtils.installTooltip(btnUpdate, 0, 5000, 0, new Tooltip(Main.i18n("update.tooltip"))); checkUpdate(); + // background backgroundItem.loadChildren(Collections.singletonList( backgroundItem.createChildren(Main.i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT) )); @@ -156,6 +157,7 @@ public final class SettingsPage extends StackPane implements DecoratorPage { Settings.INSTANCE.setBackgroundImageType((EnumBackgroundImage) newValue.getUserData()); }); + // theme themeItem.loadChildren(Arrays.asList( themeItem.createChildren(Main.i18n("color.blue"), Theme.BLUE), themeItem.createChildren(Main.i18n("color.dark_blue"), Theme.DARK_BLUE),