Skip to content

fix(ripple): 修复列表第一次点击时不显示涟漪的问题以及滚动时仍然保持涟漪的问题 #6709

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
ToobLac wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(ripple): 修复列表第一次点击时不显示涟漪的问题以及滚动时仍然保持涟漪的问题 #6709

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c43acb4
Fixes #6703
ToobLac Aug 18, 2026
385afa8
update
ToobLac Aug 18, 2026
eff4084
update
ToobLac Aug 19, 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
1 change: 0 additions & 1 deletion HMCL/src/main/java/com/jfoenix/controls/JFXRippler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@ private void releaseRippleImmediately() {
if (overlayRect != null) {
overlayRect.inAnimation.stop();
if (!forceOverlay) {
overlayRect.outAnimation.stop();
overlayRect.setOpacity(0D);
}
}
Expand Down
7 changes: 5 additions & 2 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import javafx.scene.layout.StackPane;
import org.jackhuang.hmcl.ui.FXUtils;

import java.util.Objects;

public abstract class MDListCell<T> extends ListCell<T> {
private static final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");

Expand Down Expand Up @@ -56,10 +58,11 @@ protected void updateItem(T item, boolean empty) {
T oldItem = getItem();
boolean oldEmpty = isEmpty();

ripplerContainer.releaseRippleImmediately();
super.updateItem(item, empty);

if (oldItem == item && oldEmpty == empty) return;
if (Objects.equals(oldItem, item) && oldEmpty == empty) return;

ripplerContainer.releaseRippleImmediately();

updateControl(item, empty);
if (empty || item == null) {
Expand Down
9 changes: 6 additions & 3 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
import org.jackhuang.hmcl.util.versioning.GameVersionNumber;

import java.util.Locale;
import java.util.Objects;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -214,18 +215,20 @@ private void onOpenWiki() {
@Override
public void updateItem(RemoteVersion remoteVersion, boolean empty) {
RemoteVersion oldRemoteVersion = getItem();
boolean oldEmpty = isEmpty();

ripplerContainer.releaseRippleImmediately();
super.updateItem(remoteVersion, empty);

if (Objects.equals(oldRemoteVersion, remoteVersion) && oldEmpty == empty) return;

ripplerContainer.releaseRippleImmediately();

if (empty) {
setGraphic(null);
return;
}
setGraphic(pane);

if (oldRemoteVersion == remoteVersion) return;

twoLineListItem.setTitle(I18n.getDisplayVersion(remoteVersion));
if (remoteVersion.getReleaseDate() != null) {
twoLineListItem.setSubtitle(I18n.formatDateTime(remoteVersion.getReleaseDate()));
Expand Down
9 changes: 8 additions & 1 deletion HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/DownloadListPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,15 @@ protected ModDownloadListPageSkin(DownloadListPage control) {

@Override
protected void updateItem(RemoteAddon item, boolean empty) {
this.graphic.releaseRippleImmediately();
RemoteAddon oldItem = getItem();
boolean oldEmpty = isEmpty();

super.updateItem(item, empty);

if (Objects.equals(oldItem, item) && oldEmpty == empty) return;

this.graphic.releaseRippleImmediately();

if (empty || item == null) {
setGraphic(null);
} else {
Expand Down
10 changes: 9 additions & 1 deletion HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/GameListCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import org.jackhuang.hmcl.ui.construct.*;
import org.jackhuang.hmcl.util.StringUtils;

import java.util.Objects;

import static org.jackhuang.hmcl.ui.FXUtils.determineOptimalPopupPosition;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

Expand Down Expand Up @@ -162,9 +164,15 @@ public void fire() {

@Override
public void updateItem(GameListItem item, boolean empty) {
this.graphic.releaseRippleImmediately();
GameListItem oldItem = getItem();
boolean oldEmpty = isEmpty();

super.updateItem(item, empty);

if (Objects.equals(oldItem, item) && oldEmpty == empty) return;

this.graphic.releaseRippleImmediately();

this.imageView.imageProperty().unbind();
this.content.titleProperty().unbind();
this.content.subtitleProperty().unbind();
Expand Down
8 changes: 7 additions & 1 deletion HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/GameListPopupMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.jackhuang.hmcl.util.StringUtils;

import java.util.List;
import java.util.Objects;

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

Expand Down Expand Up @@ -165,9 +166,14 @@ public Cell(ListView<GameItem> listView) {

@Override
protected void updateItem(GameItem item, boolean empty) {
this.ripplerContainer.releaseRippleImmediately();
GameItem oldItem = getItem();
boolean oldEmpty = isEmpty();

super.updateItem(item, empty);

if (Objects.equals(oldItem, item) && oldEmpty == empty) return;

this.ripplerContainer.releaseRippleImmediately();
this.imageView.imageProperty().unbind();
this.content.titleProperty().unbind();
this.content.subtitleProperty().unbind();
Expand Down
7 changes: 6 additions & 1 deletion HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/SchematicsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,9 +613,14 @@ public Cell() {

@Override
protected void updateItem(Item item, boolean empty) {
graphics.releaseRippleImmediately();
Item oldItem = getItem();
boolean oldEmpty = isEmpty();

super.updateItem(item, empty);

if (Objects.equals(oldItem, item) && oldEmpty == empty) return;

graphics.releaseRippleImmediately();
iconImageView.setImage(null);

if (empty || item == null) {
Expand Down
2 changes: 1 addition & 1 deletion HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/WorldListPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,11 @@ protected void updateItem(World world, boolean empty) {
World oldWorld = getItem();
boolean oldEmpty = isEmpty();

this.graphic.releaseRippleImmediately();
super.updateItem(world, empty);

if (oldWorld == world && oldEmpty == empty) return;

this.graphic.releaseRippleImmediately();
this.content.getTags().clear();

if (empty || world == null) {
Expand Down
7 changes: 6 additions & 1 deletion HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaManagementPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,14 @@ private static final class JavaItemCell extends ListCell<JavaRuntime> {
@Override
protected void updateItem(JavaRuntime item, boolean empty) {
JavaRuntime oldItem = getItem();
boolean oldEmpty = isEmpty();

this.graphic.releaseRippleImmediately();
super.updateItem(item, empty);

if (Objects.equals(oldItem, item) && oldEmpty == empty) return;
Comment thread
ToobLac marked this conversation as resolved.
Outdated

this.graphic.releaseRippleImmediately();

if (empty || item == null) {
setGraphic(null);
} else {
Expand Down
7 changes: 4 additions & 3 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/main/ThemePackManagementPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,20 +714,21 @@ private ThemePackItemCell(ThemePackManagementPage page) {
@Override
protected void updateItem(ThemePackManager.@Nullable InstalledThemePack themePack, boolean empty) {
var currentItem = getItem();
boolean oldEmpty = isEmpty();

this.graphic.releaseRippleImmediately();
super.updateItem(themePack, empty);

if (Objects.equals(getItem(), currentItem)) return;
if (Objects.equals(getItem(), currentItem) && oldEmpty == empty) return;

this.graphic.releaseRippleImmediately();
content.getTags().clear();
iconImage.setImage(null);
iconFallback.setVisible(false);

if (empty || themePack == null) {
setGraphic(null);
return;
}

setGraphic(graphic);

ThemePackManifest manifest = themePack.manifest();
Expand Down