Skip to content

修复在实例列表切换游戏文件夹图标不更改为实心文件夹图标的问题 #6898

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

Open
MCXCC303 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

修复在实例列表切换游戏文件夹图标不更改为实心文件夹图标的问题 #6898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3380972
fix: 修复实例文件夹选中后文件夹图标不变化
MCXCC303 Sep 21, 2026
9993baf
Merge remote-tracking branch 'refs/remotes/origin/main'
MCXCC303 Sep 21, 2026
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
11 changes: 9 additions & 2 deletions HMCL/src/main/java/org/jackhuang/hmcl/setting/GameDirectoryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,16 +366,23 @@ public static void forceOverwriteGameDirectoryFiles(GameDirectory gameDirectory)
}

/// Adds a game directory to the given store, replacing a game directory with the same ID in that store.
///
/// The replacement keeps the selected game directory pointing at an entry of [#mergedGameDirectories],
/// so the selection does not silently become detached from the merged view.
private static void addGameDirectory(GameDirectories gameDirectories, GameDirectory gameDirectory) {
Objects.requireNonNull(gameDirectory);
ObservableList<GameDirectory> entries = gameDirectories.getGameDirectories();
GameDirectoryID id = gameDirectory.getId();
for (int i = 0; i < entries.size(); i++) {
if (entries.get(i).getId().equals(id)) {
repositories.remove(entries.get(i));
GameDirectory replaced = entries.get(i);
if (replaced.getId().equals(id)) {
repositories.remove(replaced);
settings().setSelectedInstance(id, null);
entries.set(i, gameDirectory);
rebuildGameDirectories();
if (replaced == selectedGameDirectory.get()) {
selectedGameDirectory.set(gameDirectory);
}
return;
}
}
Expand Down
10 changes: 9 additions & 1 deletion HMCL/src/main/java/org/jackhuang/hmcl/ui/directory/GameDirectoryListItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.jackhuang.hmcl.setting.GameDirectoryManager;
import org.jackhuang.hmcl.ui.Controllers;
import org.jetbrains.annotations.NotNullByDefault;
import org.jetbrains.annotations.Nullable;

import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

Expand All @@ -42,7 +43,14 @@ public GameDirectoryListItem(GameDirectory gameDirectory) {
getStyleClass().setAll("game-directory-list-item", "navigation-drawer-item");
setUserData(gameDirectory);

this.selectedProperty().bind(Bindings.equal(gameDirectory, GameDirectoryManager.selectedGameDirectoryProperty()));
// The selected state is decided by the stable ID, so replacing a game directory entry with a new
// instance sharing the same ID keeps this row selected.
this.selectedProperty().bind(Bindings.createBooleanBinding(
() -> {
@Nullable GameDirectory selected = GameDirectoryManager.selectedGameDirectoryProperty().get();
return selected != null && gameDirectory.getId().equals(selected.getId());
},
GameDirectoryManager.selectedGameDirectoryProperty()));
}

/// Creates the JavaFX skin for this item.
Expand Down
Loading
Loading