Skip to content

Fix #5321 : 部分情况下主页面版本图标不会同步 #5324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CiiLu wants to merge 1 commit into from
Closed

Fix #5321 : 部分情况下主页面版本图标不会同步 #5324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,18 @@
import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.Toggle;
import javafx.scene.image.Image;
import javafx.scene.layout.*;
import javafx.scene.text.Text;
import javafx.stage.FileChooser;
import javafx.stage.Screen;
import org.jackhuang.hmcl.game.*;
import org.jackhuang.hmcl.event.Event;
import org.jackhuang.hmcl.game.GameDirectoryType;
import org.jackhuang.hmcl.game.HMCLGameRepository;
import org.jackhuang.hmcl.game.ProcessPriority;
import org.jackhuang.hmcl.game.Version;
import org.jackhuang.hmcl.java.JavaManager;
import org.jackhuang.hmcl.java.JavaRuntime;
import org.jackhuang.hmcl.setting.*;
import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.FXUtils;
Expand All @@ -47,7 +53,6 @@
import org.jackhuang.hmcl.util.javafx.PropertyUtils;
import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
import org.jackhuang.hmcl.util.platform.Architecture;
import org.jackhuang.hmcl.java.JavaRuntime;
import org.jackhuang.hmcl.util.platform.OperatingSystem;
import org.jackhuang.hmcl.util.platform.SystemInfo;
import org.jackhuang.hmcl.util.platform.hardware.PhysicalMemoryStatus;
Expand Down Expand Up @@ -498,6 +503,9 @@ public VersionSettingsPage(boolean globalSetting) {

@Override
public void loadVersion(Profile profile, String versionId) {
String lastVersionId = this.versionId;
Image lastIcon = versionId == null ? null : iconPickerItem.getImage(); //Global Setting

this.profile = profile;
this.versionId = versionId;
this.listenerHolder = new WeakListenerHolder();
Expand Down Expand Up @@ -624,6 +632,10 @@ public void loadVersion(Profile profile, String versionId) {

lastVersionSetting = versionSetting;

if (Objects.equals(lastVersionId, versionId) && !Objects.equals(profile.getRepository().getVersionIconImage(versionId), lastIcon)) {
this.profile.getRepository().onVersionIconChanged.fireEvent(new Event(this));
}

initJavaSubtitle();

loadIcon();
Expand Down Expand Up @@ -751,7 +763,10 @@ private void onDeleteIcon() {
if (localVersionSetting != null) {
localVersionSetting.setVersionIcon(VersionIconType.DEFAULT);
}

loadIcon();

profile.getRepository().onVersionIconChanged.fireEvent(new Event(this));
}

private void loadIcon() {
Expand Down
Loading