From 88f6fd196587476450b64cc7a31e1557f7b1b6ed Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Sun, 17 Feb 2019 13:57:49 +0800 Subject: [PATCH] Set cursor in button to hand by default --- .../org/jackhuang/hmcl/ui/ListPageSkin.java | 4 ++-- .../org/jackhuang/hmcl/ui/SettingsView.java | 10 ++++----- .../ui/construct/AdvancedListItemSkin.java | 4 ++-- .../hmcl/ui/construct/IconedItem.java | 2 +- .../hmcl/ui/construct/PopupMenu.java | 2 +- .../hmcl/ui/decorator/DecoratorSkin.java | 22 +++++++++---------- .../decorator/DecoratorWizardDisplayer.java | 2 +- .../hmcl/ui/versions/GameListSkin.java | 2 +- .../hmcl/ui/versions/ModListPageSkin.java | 2 +- HMCL/src/main/resources/assets/css/root.css | 3 ++- 10 files changed, 27 insertions(+), 26 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java index ae084d9f9..874fc743f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java @@ -70,7 +70,7 @@ public class ListPageSkin extends SkinBase> { JFXButton btnAdd = new JFXButton(); FXUtils.setLimitWidth(btnAdd, 40); FXUtils.setLimitHeight(btnAdd, 40); - btnAdd.getStyleClass().setAll("jfx-button-raised-round"); + btnAdd.getStyleClass().add("jfx-button-raised-round"); btnAdd.setButtonType(JFXButton.ButtonType.RAISED); btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1)); btnAdd.setOnMouseClicked(e -> skinnable.add()); @@ -78,7 +78,7 @@ public class ListPageSkin extends SkinBase> { JFXButton btnRefresh = new JFXButton(); FXUtils.setLimitWidth(btnRefresh, 40); FXUtils.setLimitHeight(btnRefresh, 40); - btnRefresh.getStyleClass().setAll("jfx-button-raised-round"); + btnRefresh.getStyleClass().add("jfx-button-raised-round"); btnRefresh.setButtonType(JFXButton.ButtonType.RAISED); btnRefresh.setGraphic(SVG.refresh(Theme.whiteFillBinding(), -1, -1)); btnRefresh.setOnMouseClicked(e -> skinnable.refresh()); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java index 07638486c..fc9fc7513 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java @@ -83,7 +83,7 @@ public abstract class SettingsView extends StackPane { lblUpdate = new Label(i18n("update")); lblUpdateSub = new Label(); - lblUpdateSub.getStyleClass().setAll("subtitle-label"); + lblUpdateSub.getStyleClass().add("subtitle-label"); headerLeft.getChildren().setAll(lblUpdate, lblUpdateSub); updatePane.setHeaderLeft(headerLeft); @@ -92,7 +92,7 @@ public abstract class SettingsView extends StackPane { { btnUpdate = new JFXButton(); btnUpdate.setOnMouseClicked(e -> onUpdate()); - btnUpdate.getStyleClass().setAll("toggle-icon4"); + btnUpdate.getStyleClass().add("toggle-icon4"); btnUpdate.setGraphic(SVG.update(Theme.blackFillBinding(), 20, 20)); updatePane.setHeaderRight(btnUpdate); @@ -124,7 +124,7 @@ public abstract class SettingsView extends StackPane { Label help = new Label(i18n("help")); Label helpSubtitle = new Label(i18n("help.detail")); - helpSubtitle.getStyleClass().setAll("subtitle-label"); + helpSubtitle.getStyleClass().add("subtitle-label"); headerLeft.getChildren().setAll(help, helpSubtitle); updatePane.setLeft(headerLeft); @@ -133,7 +133,7 @@ public abstract class SettingsView extends StackPane { { JFXButton btnExternal = new JFXButton(); btnExternal.setOnMouseClicked(e -> onHelp()); - btnExternal.getStyleClass().setAll("toggle-icon4"); + btnExternal.getStyleClass().add("toggle-icon4"); btnExternal.setGraphic(SVG.openInNew(Theme.blackFillBinding(), -1, -1)); updatePane.setRight(btnExternal); @@ -337,7 +337,7 @@ public abstract class SettingsView extends StackPane { { JFXButton logButton = new JFXButton(i18n("settings.launcher.launcher_log.export")); logButton.setOnMouseClicked(e -> onExportLogs()); - logButton.getStyleClass().setAll("jfx-button-border"); + logButton.getStyleClass().add("jfx-button-border"); logPane.setHeaderRight(logButton); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java index 3e524807b..ce451fd90 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java @@ -83,7 +83,7 @@ public class AdvancedListItemSkin extends SkinBase { HBox right = new HBox(); right.setAlignment(Pos.CENTER); right.setMouseTransparent(true); - right.getStyleClass().setAll("toggle-icon4"); + right.getStyleClass().add("toggle-icon4"); FXUtils.setLimitWidth(right, 40); FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(), newGraphic -> { @@ -99,7 +99,7 @@ public class AdvancedListItemSkin extends SkinBase { visible -> root.setRight(visible ? right : null)); stackPane.setStyle("-fx-padding: 10 16 10 16;"); - stackPane.getStyleClass().setAll("transparent"); + stackPane.getStyleClass().add("transparent"); stackPane.setPickOnBounds(false); stackPane.getChildren().setAll(root); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/IconedItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/IconedItem.java index fe2d9dd55..bf718fce9 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/IconedItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/IconedItem.java @@ -45,7 +45,7 @@ public class IconedItem extends RipplerContainer { hBox.getChildren().add(icon); } - hBox.getStyleClass().setAll("iconed-item-container"); + hBox.getStyleClass().add("iconed-item-container"); Label textLabel = new Label(); textLabel.setId("label"); textLabel.setMouseTransparent(true); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/PopupMenu.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/PopupMenu.java index cbe7b667b..5173d663d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/PopupMenu.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/PopupMenu.java @@ -64,7 +64,7 @@ public class PopupMenu extends Control { public static Node wrapPopupMenuItem(Node node) { StackPane pane = new StackPane(); pane.getChildren().setAll(node); - pane.getStyleClass().setAll("menu-container"); + pane.getStyleClass().add("menu-container"); node.setMouseTransparent(true); return new RipplerContainer(pane); } 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 f20502447..a4aac7fdc 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 @@ -73,7 +73,7 @@ public class DecoratorSkin extends SkinBase { Decorator skinnable = getSkinnable(); BorderPane root = new BorderPane(); - root.getStyleClass().setAll("jfx-decorator", "resize-border"); + root.getStyleClass().addAll("jfx-decorator", "resize-border"); root.setPrefHeight(519); root.setPrefWidth(800); root.setMaxHeight(Region.USE_PREF_SIZE); @@ -83,7 +83,7 @@ public class DecoratorSkin extends SkinBase { StackPane drawerWrapper = new StackPane(); skinnable.setDrawerWrapper(drawerWrapper); - drawerWrapper.getStyleClass().setAll("jfx-decorator-drawer"); + drawerWrapper.getStyleClass().add("jfx-decorator-drawer"); drawerWrapper.backgroundProperty().bind(skinnable.backgroundProperty()); FXUtils.setOverflowHidden(drawerWrapper, true); { @@ -92,10 +92,10 @@ public class DecoratorSkin extends SkinBase { { BorderPane leftRootPane = new BorderPane(); FXUtils.setLimitWidth(leftRootPane, 200); - leftRootPane.getStyleClass().setAll("jfx-decorator-content-container"); + leftRootPane.getStyleClass().add("jfx-decorator-content-container"); StackPane drawerContainer = new StackPane(); - drawerContainer.getStyleClass().setAll("gray-background"); + drawerContainer.getStyleClass().add("gray-background"); Bindings.bindContent(drawerContainer.getChildren(), skinnable.drawerProperty()); leftRootPane.setCenter(drawerContainer); @@ -111,7 +111,7 @@ public class DecoratorSkin extends SkinBase { { contentPlaceHolder = new StackPane(); - contentPlaceHolder.getStyleClass().setAll("jfx-decorator-content-container"); + contentPlaceHolder.getStyleClass().add("jfx-decorator-content-container"); contentPlaceHolder.backgroundProperty().bind(skinnable.contentBackgroundProperty()); FXUtils.setOverflowHidden(contentPlaceHolder, true); Bindings.bindContent(contentPlaceHolder.getChildren(), skinnable.contentProperty()); @@ -189,14 +189,14 @@ public class DecoratorSkin extends SkinBase { { JFXButton backNavButton = new JFXButton(); backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), -1, -1)); - backNavButton.getStyleClass().setAll("jfx-decorator-button"); + backNavButton.getStyleClass().add("jfx-decorator-button"); backNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding()); backNavButton.onActionProperty().bind(skinnable.onBackNavButtonActionProperty()); backNavButton.visibleProperty().bind(skinnable.canBackProperty()); closeNavButton = new JFXButton(); closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1)); - closeNavButton.getStyleClass().setAll("jfx-decorator-button"); + closeNavButton.getStyleClass().add("jfx-decorator-button"); closeNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding()); closeNavButton.onActionProperty().bind(skinnable.onCloseNavButtonActionProperty()); @@ -219,7 +219,7 @@ public class DecoratorSkin extends SkinBase { VBox navCenter = new VBox(); navCenter.setAlignment(Pos.CENTER_LEFT); Label titleLabel = new Label(); - titleLabel.getStyleClass().setAll("jfx-decorator-title"); + titleLabel.getStyleClass().add("jfx-decorator-title"); titleLabel.textProperty().bind(skinnable.drawerTitleProperty()); navCenter.getChildren().setAll(titleLabel); navBar.setCenter(navCenter); @@ -228,7 +228,7 @@ public class DecoratorSkin extends SkinBase { navRight.setAlignment(Pos.CENTER_RIGHT); refreshNavButton = new JFXButton(); refreshNavButton.setGraphic(SVG.refresh(Theme.foregroundFillBinding(), -1, -1)); - refreshNavButton.getStyleClass().setAll("jfx-decorator-button"); + refreshNavButton.getStyleClass().add("jfx-decorator-button"); refreshNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding()); refreshNavButton.onActionProperty().bind(skinnable.onRefreshNavButtonActionProperty()); refreshNavButton.visibleProperty().bind(skinnable.canRefreshProperty()); @@ -251,12 +251,12 @@ public class DecoratorSkin extends SkinBase { StackPane pane = new StackPane(minus); pane.setAlignment(Pos.CENTER); btnMin.setGraphic(pane); - btnMin.getStyleClass().setAll("jfx-decorator-button"); + btnMin.getStyleClass().add("jfx-decorator-button"); btnMin.setOnAction(e -> skinnable.minimize()); JFXButton btnClose = new JFXButton(); btnClose.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1)); - btnClose.getStyleClass().setAll("jfx-decorator-button"); + btnClose.getStyleClass().add("jfx-decorator-button"); btnClose.setOnAction(e -> skinnable.close()); buttonsContainer.getChildren().setAll(separator, btnMin, btnClose); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorWizardDisplayer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorWizardDisplayer.java index a8826b56b..0bc658957 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorWizardDisplayer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorWizardDisplayer.java @@ -52,7 +52,7 @@ public class DecoratorWizardDisplayer extends StackPane implements TaskExecutorD wizardController.setProvider(provider); wizardController.onStart(); - getStyleClass().setAll("white-background"); + getStyleClass().add("white-background"); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListSkin.java index c011b2774..faae0ca74 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListSkin.java @@ -50,7 +50,7 @@ public class GameListSkin extends SkinBase { { HBox toolbar = new HBox(); - toolbar.getStyleClass().setAll("jfx-tool-bar-second"); + toolbar.getStyleClass().add("jfx-tool-bar-second"); JFXDepthManager.setDepth(toolbar, 1); toolbar.setPickOnBounds(false); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java index 224d52673..f247f6149 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java @@ -58,7 +58,7 @@ public class ModListPageSkin extends SkinBase { { HBox toolbar = new HBox(); - toolbar.getStyleClass().setAll("jfx-tool-bar-second"); + toolbar.getStyleClass().add("jfx-tool-bar-second"); JFXDepthManager.setDepth(toolbar, 1); toolbar.setPickOnBounds(false); diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 93bd3c4c7..9208725e9 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -346,7 +346,7 @@ } .jfx-tool-bar .jfx-decorator-button { - -fx-cursor: head; + -fx-cursor: hand; } .jfx-tool-bar Label { @@ -504,6 +504,7 @@ .jfx-button { -jfx-disable-visual-focus: true; + -fx-cursor: hand; } .jfx-button-raised {