Skip to content

Commit db38b4d

Browse files
authored
修复自动安装界面卡片上按钮无法点击的问题 (#5251)
1 parent ba5e633 commit db38b4d

2 files changed

Lines changed: 19 additions & 13 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,15 @@ private static final class InstallerItemSkin extends SkinBase<InstallerItem> {
283283
}
284284
pane.getStyleClass().add("installer-item");
285285
RipplerContainer container = new RipplerContainer(pane);
286-
container.setPosition(JFXRippler.RipplerPos.FRONT);
287-
getChildren().setAll(container);
286+
container.setPosition(JFXRippler.RipplerPos.BACK);
287+
StackPane paneWrapper = new StackPane();
288+
paneWrapper.getStyleClass().add("installer-item-wrapper");
289+
paneWrapper.getChildren().setAll(container);
290+
getChildren().setAll(paneWrapper);
288291

289292
pane.pseudoClassStateChanged(LIST_ITEM, control.style == Style.LIST_ITEM);
290293
pane.pseudoClassStateChanged(CARD, control.style == Style.CARD);
294+
paneWrapper.pseudoClassStateChanged(CARD, control.style == Style.CARD);
291295

292296
if (control.iconType != null) {
293297
ImageView view = new ImageView(control.iconType.getIcon());

HMCL/src/main/resources/assets/css/root.css

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -388,31 +388,33 @@
388388
-fx-cursor: hand;
389389
}
390390

391-
.installer-item {
392-
-fx-padding: 8px;
391+
.installer-item-wrapper {
392+
-fx-background-color: -monet-surface;
393+
-fx-background-radius: 4;
394+
-fx-pref-width: 180px;
395+
}
396+
397+
.installer-item-wrapper:card {
398+
-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.26), 10, 0.12, -1, 2);
393399
}
394400

395-
.installer-item:list-item {
401+
.installer-item-wrapper .installer-item:list-item {
402+
-fx-padding: 8px;
396403
-fx-border-color: -monet-outline-variant;
397404
-fx-border-width: 0 0 1 0;
398405
-fx-alignment: center-left;
399406
}
400407

401-
.installer-item:list-item > .installer-item-name {
408+
.installer-item-wrapper .installer-item:list-item > .installer-item-name {
402409
-fx-pref-width: 80px;
403410
}
404411

405-
.installer-item:list-item > .installer-item-status {
412+
.installer-item-wrapper .installer-item:list-item > .installer-item-status {
406413
-fx-max-width: infinity;
407414
}
408415

409-
.installer-item:card {
410-
-fx-background-color: -monet-surface;
411-
-fx-background-radius: 4;
416+
.installer-item-wrapper .installer-item:card {
412417
-fx-alignment: center;
413-
-fx-pref-width: 180px;
414-
415-
-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.26), 10, 0.12, -1, 2);
416418
}
417419

418420
/*******************************************************************************

0 commit comments

Comments
 (0)