Merge remote-tracking branch 'official/main' into prs

# Conflicts: # HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java
burningtnt · Dec 13, 2024 · 22a8858 · 22a8858
2 parents 0c20ca0 + 4c6fdf4
commit 22a8858
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java
@@ -43,6 +43,9 @@ public final class UpgradeDialog extends JFXDialogLayout {
     public UpgradeDialog(RemoteVersion remoteVersion, Runnable updateRunnable) {
         net.burningtnt.hmclprs.hooks.PRCollectionRuntime.onCreateUpgradeDialog();
 
+        maxWidthProperty().bind(Controllers.getScene().widthProperty().multiply(0.7));
+        maxHeightProperty().bind(Controllers.getScene().heightProperty().multiply(0.7));
+
         setHeading(new Label(i18n("update.changelog")));
         setBody(new ProgressIndicator());
 

diff --git a/HMCLCore/build.gradle.kts b/HMCLCore/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     api("org.nanohttpd:nanohttpd:2.3.1")
     api("org.apache.commons:commons-compress:1.25.0")
     api("org.jsoup:jsoup:1.18.1")
-    compileOnlyApi("org.jetbrains:annotations:24.1.0")
+    compileOnlyApi("org.jetbrains:annotations:26.0.1")
 
     if (JavaVersion.current().isJava8) {
         org.gradle.internal.jvm.Jvm.current().toolsJar?.let {