创建 SVGContainer 控件 by Glavo · Pull Request #5464 · HMCL-dev/HMCL

Glavo · 2026-02-06T17:40:29Z

No description provided.

Copilot

Pull request overview

This PR introduces a reusable SVGView JavaFX control to render SVG enum icons (with optional fade transitions) and refactors existing UI code to use it instead of manually wiring SVGPath/Group wrappers.

Changes:

Added SVGView control to display SVG icons with configurable size and optional fade animation on icon changes.
Refactored icon rendering in SchematicsPage and AdvancedListBox to use SVGView.
Extended SVG enum with an explicit empty icon (NONE) and centralized SVGPath creation/sizing helpers.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.

File	Description
`HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/SchematicsPage.java`	Replaces per-cell `SVGPath`/wrapper usage with `SVGView` for list item icons.
`HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListBox.java`	Switches navigation drawer tab icon swapping to `SVGView` with animation duration.
`HMCL/src/main/java/org/jackhuang/hmcl/ui/SVGView.java`	Adds new `SVGView` JavaFX `Control` with CSS-styleable icon and size plus fade transition support.
`HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java`	Adds `NONE` and refactors SVGPath creation/sizing into reusable helpers used by `SVGView`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-06T17:48:24Z

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

+                protected void invalidated() {
+                    if (getSkin() instanceof Skin skin) {
+                        skin.updateSize(get());
+                    }


iconSizeProperty changes affect this control’s min/pref size, but the property invalidation only updates the SVGPath scale. Without calling requestLayout() (or at least SVGView.this.requestLayout()), parent containers may not relayout when the icon size changes (especially when size is set via CSS at runtime). Trigger a layout pass when iconSize is invalidated.

Suggested change

}

}

SVGView.this.requestLayout();

Copilot · 2026-02-06T17:48:25Z

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListBox.java

+        var leftGraphics = new SVGView(AdvancedListItem.LEFT_ICON_SIZE);
+        leftGraphics.setMouseTransparent(true);
+        AdvancedListItem.setAlignment(leftGraphics, Pos.CENTER);
+        AdvancedListItem.setMargin(leftGraphics, AdvancedListItem.LEFT_ICON_MARGIN);
+        FXUtils.onChangeAndOperate(item.activeProperty(), active -> leftGraphics.setIcon(active ? selectedGraphic : unselectedGraphic));
+        leftGraphics.setAnimationDuration(Motion.SHORT4);
+        item.setLeftGraphic(leftGraphics);


Local variable name leftGraphics is plural but holds a single SVGView. Renaming to leftGraphic/leftIcon (or similar) would better match setLeftGraphic(...) and reduce confusion.

Suggested change

var leftGraphics = new SVGView(AdvancedListItem.LEFT_ICON_SIZE);

leftGraphics.setMouseTransparent(true);

AdvancedListItem.setAlignment(leftGraphics, Pos.CENTER);

AdvancedListItem.setMargin(leftGraphics, AdvancedListItem.LEFT_ICON_MARGIN);

FXUtils.onChangeAndOperate(item.activeProperty(), active -> leftGraphics.setIcon(active ? selectedGraphic : unselectedGraphic));

leftGraphics.setAnimationDuration(Motion.SHORT4);

item.setLeftGraphic(leftGraphics);

var leftGraphic = new SVGView(AdvancedListItem.LEFT_ICON_SIZE);

leftGraphic.setMouseTransparent(true);

AdvancedListItem.setAlignment(leftGraphic, Pos.CENTER);

AdvancedListItem.setMargin(leftGraphic, AdvancedListItem.LEFT_ICON_MARGIN);

FXUtils.onChangeAndOperate(item.activeProperty(), active -> leftGraphic.setIcon(active ? selectedGraphic : unselectedGraphic));

leftGraphic.setAnimationDuration(Motion.SHORT4);

item.setLeftGraphic(leftGraphic);

Copilot · 2026-02-06T17:48:25Z

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/SchematicsPage.java

                this.left = new StackPane();
+                left.setMouseTransparent(true);
                left.setPadding(new Insets(0, 8, 0, 0));


left is set to mouseTransparent, but later a tooltip is installed on left. A mouse-transparent node won't receive hover events, so the tooltip likely never shows. Consider removing left.setMouseTransparent(true) or moving the tooltip installation to a node that still receives mouse events (e.g., the cell root/graphics), while keeping only the icon node mouse-transparent if needed for click-through.

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-06T18:50:34Z

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

+    /// Creates an SVGView with the default icon and the default icon size.
+    public SVGContainer() {
+        this(SVG.NONE, SVG.DEFAULT_SIZE);
+    }
+
+    /// Creates an SVGView showing the given icon using the default icon size.
+    ///
+    /// @param icon the [SVG] icon to display
+    public SVGContainer(SVG icon) {
+        this(icon, SVG.DEFAULT_SIZE);
+    }
+
+    /// Creates an SVGView with a custom icon size. The initial icon is
+    /// [SVG#NONE].
+    ///
+    /// @param iconSize the icon size
+    public SVGContainer(double iconSize) {
+        this(SVG.NONE, iconSize);
+    }
+
+    /// Creates an SVGView with the specified icon and size.
+    ///


The Javadoc-style comments repeatedly refer to this component as “SVGView” (e.g., “Creates an SVGView …”), but the class name is SVGContainer. This is confusing for readers and makes searching harder; please update the wording to match the actual type name.

Copilot · 2026-02-06T18:50:35Z

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

+    public SVGContainer createIcon(double size) {
+        return new SVGContainer(this, size);


Changing public ... createIcon(double size) to return SVGContainer instead of Node changes the method descriptor and is binary-incompatible with any already-compiled code calling this API. If this method is part of a stable API surface, consider keeping the original Node-returning signature (e.g., return type Node while still constructing an SVGContainer internally, or introduce a new method for SVGContainer and keep the old one for compatibility).

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-07T12:47:21Z

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

+    @Override
+    protected void layoutChildren() {
+        // Do nothing
+    }


layoutChildren() is a no-op, so the internal SVGPath nodes are never positioned/sized by the container. This can lead to inconsistent alignment (especially during cross-fade when there are two paths) and can also make the container’s size depend on the raw path bounds rather than the requested iconSize. Consider making this a Region/StackPane (or overriding isResizable() and laying out children) and explicitly centering the path(s) within an iconSize × iconSize box.

Glavo added 12 commits February 6, 2026 04:41

update

7e4b195

update

ac48a21

update

8164a67

update

40bb6ea

update

5ae7e93

Merge remote-tracking branch 'upstream/main' into svg-icon

99af761

update

41957b4

update

199f0fc

update

5c38c09

update

90a9b69

update

0cf7096

update

9d04936

Glavo requested a review from Copilot February 6, 2026 17:44

Copilot started reviewing on behalf of Glavo February 6, 2026 17:44 View session

Copilot AI reviewed Feb 6, 2026

View reviewed changes

Glavo added 2 commits February 7, 2026 01:52

update

1de46a2

update

582c27a

Glavo changed the title ~~创建 SVGView 控件~~ 创建 SVGContainer 控件 Feb 6, 2026

update

032f716

Glavo requested a review from Copilot February 6, 2026 18:46

Copilot started reviewing on behalf of Glavo February 6, 2026 18:46 View session

Copilot AI reviewed Feb 6, 2026

View reviewed changes

update

dab6b79

Glavo requested a review from Copilot February 7, 2026 12:42

Copilot started reviewing on behalf of Glavo February 7, 2026 12:42 View session

Copilot AI reviewed Feb 7, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

创建 SVGContainer 控件#5464

创建 SVGContainer 控件#5464
Glavo wants to merge 16 commits intoHMCL-dev:mainfrom
Glavo:svg-icon

Glavo commented Feb 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI Feb 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		public SVGContainer createIcon(double size) {
		return new SVGContainer(this, size);

Conversation

Glavo commented Feb 6, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant