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

Use databind for update bubble

Browse Source
This commit is contained in:
yushijinhun
2018-10-02 21:06:18 +08:00
parent b8bf56c8c3
commit 3facbba4ee
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
View File

@@ -24,17 +24,13 @@ import javafx.animation.Interpolator;
import javafx.animation.KeyFrame; import javafx.animation.KeyFrame;
import javafx.animation.KeyValue; import javafx.animation.KeyValue;
import javafx.animation.Timeline; import javafx.animation.Timeline;
import javafx.beans.InvalidationListener;
import javafx.beans.WeakInvalidationListener;
import javafx.beans.property.ReadOnlyStringProperty; import javafx.beans.property.ReadOnlyStringProperty;
import javafx.beans.property.ReadOnlyStringWrapper; import javafx.beans.property.ReadOnlyStringWrapper;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.StackPane; import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.scene.shape.Rectangle; import javafx.scene.shape.Rectangle;
import javafx.util.Duration; import javafx.util.Duration;
import org.jackhuang.hmcl.event.EventBus; import org.jackhuang.hmcl.event.EventBus;
@@ -52,6 +48,7 @@ import org.jackhuang.hmcl.ui.versions.Versions;
import org.jackhuang.hmcl.upgrade.RemoteVersion; import org.jackhuang.hmcl.upgrade.RemoteVersion;
import org.jackhuang.hmcl.upgrade.UpdateChecker; import org.jackhuang.hmcl.upgrade.UpdateChecker;
import org.jackhuang.hmcl.upgrade.UpdateHandler; import org.jackhuang.hmcl.upgrade.UpdateHandler;
import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
import org.jackhuang.hmcl.util.versioning.VersionNumber; import org.jackhuang.hmcl.util.versioning.VersionNumber;
import java.util.List; import java.util.List;
@@ -64,7 +61,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
private final PopupMenu menu = new PopupMenu(); private final PopupMenu menu = new PopupMenu();
private final JFXPopup popup = new JFXPopup(menu); private final JFXPopup popup = new JFXPopup(menu);
private InvalidationListener updateListener;
@FXML @FXML
private StackPane main; private StackPane main;
@@ -75,7 +71,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
@FXML @FXML
private JFXButton btnMenu; private JFXButton btnMenu;
@FXML @FXML
private JFXButton closeButton; private JFXButton closeUpdateButton;
@FXML @FXML
private Label lblCurrentGame; private Label lblCurrentGame;
@FXML @FXML
@@ -95,8 +91,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
menu.setMinWidth(545); menu.setMinWidth(545);
updatePane.visibleProperty().bind(UpdateChecker.outdatedProperty()); updatePane.visibleProperty().bind(UpdateChecker.outdatedProperty());
closeButton.setGraphic(SVG.close(Theme.whiteFillBinding(), 10, 10)); closeUpdateButton.setGraphic(SVG.close(Theme.whiteFillBinding(), 10, 10));
closeButton.setOnMouseClicked(event -> { closeUpdateButton.setOnMouseClicked(event -> {
Duration duration = Duration.millis(320); Duration duration = Duration.millis(320);
Timeline nowAnimation = new Timeline(); Timeline nowAnimation = new Timeline();
nowAnimation.getKeyFrames().addAll( nowAnimation.getKeyFrames().addAll(
@@ -111,15 +107,9 @@ public final class MainPage extends StackPane implements DecoratorPage {
nowAnimation.play(); nowAnimation.play();
}); });
lblIcon.setGraphic(SVG.update(Theme.whiteFillBinding(), 20, 20)); lblIcon.setGraphic(SVG.update(Theme.whiteFillBinding(), 20, 20));
updateListener = any -> { lblLatestVersion.titleProperty().bind(
if (UpdateChecker.isOutdated()) { MultiStepBinding.of(UpdateChecker.latestVersionProperty())
lblLatestVersion.setTitle(i18n("update.bubble.title", UpdateChecker.getLatestVersion().getVersion())); .map(version -> version == null ? "" : i18n("update.bubble.title", version.getVersion())));
}
};
UpdateChecker.latestVersionProperty().addListener(new WeakInvalidationListener(updateListener));
UpdateChecker.outdatedProperty().addListener(new WeakInvalidationListener(updateListener));
UpdateChecker.checkingUpdateProperty().addListener(new WeakInvalidationListener(updateListener));
updateListener.invalidated(null);
StackPane graphic = new StackPane(); StackPane graphic = new StackPane();
Node svg = SVG.triangle(Theme.whiteFillBinding(), 10, 10); Node svg = SVG.triangle(Theme.whiteFillBinding(), 10, 10);

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

@@ -24,7 +24,7 @@
</StackPane.margin> </StackPane.margin>
</HBox> </HBox>
<JFXButton fx:id="closeButton" StackPane.alignment="TOP_RIGHT" styleClass="toggle-icon-tiny"> <JFXButton fx:id="closeUpdateButton" StackPane.alignment="TOP_RIGHT" styleClass="toggle-icon-tiny">
<StackPane.margin> <StackPane.margin>
<Insets topRightBottomLeft="5" /> <Insets topRightBottomLeft="5" />
</StackPane.margin> </StackPane.margin>