Skip to content

支持通过拖动标题栏退出最大化 #5172

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

Merged
Glavo merged 5 commits into from
Jan 16, 2026
Merged

支持通过拖动标题栏退出最大化 #5172

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30881d7
支持通过拖动标题栏退出最大化
neveler Jan 9, 2026
4200693
update
neveler Jan 10, 2026
7e31bdd
update
neveler Jan 10, 2026
e0adabc
Merge branch 'HMCL-dev:main' into fork/p1
neveler Jan 12, 2026
57fa81b
update
neveler Jan 12, 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
12 changes: 12 additions & 0 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,18 @@ private Node createNavBar(Decorator skinnable, double leftPaneWidth, boolean can
}
if (onTitleBarDoubleClick != null)
center.setOnMouseClicked(onTitleBarDoubleClick);
center.setOnMouseDragged(mouseEvent -> {
Copy link

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This handler only handles the initial un-maximize action but doesn't consume the event or continue the drag. After un-maximizing, you should either consume the event or delegate to the existing onMouseDragged logic to ensure smooth continuous dragging. Without this, there's a disconnect between the un-maximize action and subsequent drag behavior.

Copilot uses AI. Check for mistakes.
if (!getSkinnable().isDragging() && primaryStage.isMaximized()) {
getSkinnable().setDragging(true);
mouseInitX = mouseEvent.getScreenX();
mouseInitY = mouseEvent.getScreenY();
primaryStage.setMaximized(false);
stageInitWidth = primaryStage.getWidth();
stageInitHeight = primaryStage.getHeight();
primaryStage.setY(stageInitY = 0);
primaryStage.setX(stageInitX = mouseInitX - stageInitWidth / 2);
Comment on lines +339 to +340
Copy link

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic doesn't continue dragging after un-maximizing. After setting dragging to true and un-maximizing, the window is positioned but subsequent mouse movement won't move the window until the user releases and starts dragging again. The existing onMouseDragged handler (line 450) expects stageInitX and stageInitY to represent the initial stage position, not 0. Consider setting stageInitX and stageInitY to the calculated position values (mouseInitX - stageInitWidth / 2 and 0 respectively) after setting the stage position, so the subsequent dragging in onMouseDragged continues smoothly.

Suggested change
primaryStage.setY(stageInitY = 0);
primaryStage.setX(stageInitX = mouseInitX - stageInitWidth / 2);
double newStageY = 0;
double newStageX = mouseInitX - stageInitWidth / 2;
primaryStage.setY(newStageY);
primaryStage.setX(newStageX);
stageInitY = newStageY;
stageInitX = newStageX;

Copilot uses AI. Check for mistakes.
}
});
navBar.setCenter(center);

if (canRefresh) {
Expand Down
Loading