diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java index e342d4037..87b0e7e99 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java index 961ceed7d..8b12ff90d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java @@ -19,7 +19,7 @@ package org.jackhuang.hmcl.setting; import com.google.gson.*; import com.google.gson.annotations.JsonAdapter; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import javafx.application.Platform; import javafx.beans.InvalidationListener; import javafx.beans.Observable; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java index b38fc8b9b..d925be84b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.setting; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import javafx.application.Platform; import javafx.beans.Observable; import javafx.beans.property.*; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java index 3dcd9dc76..8a2de0b6f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import javafx.scene.Node; import javafx.scene.Scene; import javafx.scene.image.Image; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java index 51259aacd..ff6ecf94b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import org.jackhuang.hmcl.auth.Account; import org.jackhuang.hmcl.auth.AuthInfo; import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java index 614ee0295..c03fae6c8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import com.jfoenix.controls.*; import javafx.animation.Animation; import javafx.animation.Interpolator; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java index 991f4fbc5..bda00a079 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import javafx.application.Platform; import javafx.scene.image.Image; import javafx.scene.layout.Region; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java index 0eca64e0e..c986c317b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui.account; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXRadioButton; import com.jfoenix.effects.JFXDepthManager; @@ -103,7 +103,7 @@ public class AccountListItemSkin extends SkinBase { right.getChildren().add(btnRemove); root.setRight(right); - root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;"); + root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;"); JFXDepthManager.setDepth(root, 1); getChildren().setAll(root); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java index dacc36120..cbe283d8f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui.account; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import com.jfoenix.controls.*; import javafx.application.Platform; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogPane.java index e7c71463a..53ebbc398 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogPane.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui.construct; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXProgressBar; import javafx.application.Platform; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java index 79989649c..85728e67e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui.versions; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import javafx.application.Platform; import javafx.beans.property.*; import javafx.collections.FXCollections; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java index a6de9f3f8..b105c0270 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui.versions; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXPopup; import com.jfoenix.controls.JFXRadioButton; @@ -87,7 +87,7 @@ public class GameListItemSkin extends SkinBase { right.getChildren().add(btnManage); root.setRight(right); - root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;"); + root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;"); JFXDepthManager.setDepth(root, 1); getChildren().setAll(root); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java index 9775eba38..3b7a80001 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui.versions; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import com.jfoenix.controls.JFXTabPane; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ListProperty; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java index e837558b2..3fde14e65 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui.wizard; -import com.jfoenix.concurrency.JFXUtilities; +import com.jfoenix.utils.JFXUtilities; import javafx.beans.property.StringProperty; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 497bfb918..93bd3c4c7 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -502,6 +502,10 @@ * * *******************************************************************************/ +.jfx-button { + -jfx-disable-visual-focus: true; +} + .jfx-button-raised { -fx-background-color: -fx-base-color; } diff --git a/lib/JFoenix.jar b/lib/JFoenix.jar index 1672f1ebe..4712ea8cd 100644 Binary files a/lib/JFoenix.jar and b/lib/JFoenix.jar differ