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

Open
neveler wants to merge 5 commits into
base: main
Choose a base branch
from
Open

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

Changes from 1 commit
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
7 changes: 6 additions & 1 deletion 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 @@ -101,7 +101,7 @@ public DecoratorSkin(Decorator control) {
// https://github.com/HMCL-dev/HMCL/issues/4290
if (OperatingSystem.CURRENT_OS != OperatingSystem.MACOS) {
onWindowsStatusChange = observable -> {
if (primaryStage.isIconified() || primaryStage.isFullScreen() || primaryStage.isMaximized()) {
if (primaryStage.isIconified() || primaryStage.isFullScreen()) {
root.removeEventFilter(MouseEvent.MOUSE_RELEASED, onMouseReleased);
root.removeEventFilter(MouseEvent.MOUSE_DRAGGED, onMouseDragged);
root.removeEventFilter(MouseEvent.MOUSE_MOVED, onMouseMoved);
Expand Down Expand Up @@ -446,6 +446,11 @@ private void onMouseDragged(MouseEvent mouseEvent) {
stageInitHeight = primaryStage.getHeight();
}

if (primaryStage.isMaximized()) {
primaryStage.setMaximized(false);
mouseInitX = primaryStage.getWidth() / 2;
Copy link

Copilot AI Jan 10, 2026

Choose a reason for hiding this comment

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

When exiting maximized state during a drag operation, only mouseInitX is being updated but mouseInitY is not. This will cause incorrect vertical positioning when the user drags the window. Both coordinates should be updated to ensure the window follows the cursor properly. Additionally, stageInitX and stageInitY should be set to the new window position after un-maximizing to ensure proper drag calculations.

Suggested change
mouseInitX = primaryStage.getWidth() / 2;
// Reinitialize drag reference points after restoring from maximized state
mouseInitX = mouseEvent.getScreenX();
mouseInitY = mouseEvent.getScreenY();
stageInitX = primaryStage.getX();
stageInitY = primaryStage.getY();
stageInitWidth = primaryStage.getWidth();
stageInitHeight = primaryStage.getHeight();

Copilot uses AI. Check for mistakes.
}

if (primaryStage.isFullScreen() || !mouseEvent.isPrimaryButtonDown() || mouseEvent.isStillSincePress())
return;

Expand Down
Loading