Skip to content

feat:添加窗口拖动限制 #4664

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

feat:添加窗口拖动限制 #4664

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2e5ece
feat:添加窗口拖动限制
Mine-diamond Oct 12, 2025
bc4af81
feat:删除log
Mine-diamond Oct 13, 2025
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
33 changes: 29 additions & 4 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 @@ -21,11 +21,14 @@
import javafx.beans.InvalidationListener;
import javafx.beans.WeakInvalidationListener;
import javafx.beans.binding.Bindings;
import javafx.beans.value.ObservableBooleanValue;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
import javafx.event.EventHandler;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.geometry.Rectangle2D;
import javafx.scene.Cursor;
import javafx.scene.Node;
import javafx.scene.control.Label;
Expand All @@ -34,11 +37,14 @@
import javafx.scene.effect.DropShadow;
import javafx.scene.input.MouseButton;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.*;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.StackPane;
import javafx.scene.paint.Color;
import javafx.scene.shape.Rectangle;
import javafx.stage.Screen;
import javafx.stage.Stage;

import org.jackhuang.hmcl.Metadata;
import org.jackhuang.hmcl.setting.Theme;
import org.jackhuang.hmcl.ui.FXUtils;
Expand All @@ -49,6 +55,8 @@
import org.jackhuang.hmcl.ui.wizard.Navigation;
import org.jackhuang.hmcl.util.platform.OperatingSystem;

import java.util.Objects;

public class DecoratorSkin extends SkinBase<Decorator> {
private final StackPane root, parent;
private final StackPane titleContainer;
Expand All @@ -60,6 +68,8 @@ public class DecoratorSkin extends SkinBase<Decorator> {
private final EventHandler<MouseEvent> onTitleBarDoubleClick;

private double mouseInitX, mouseInitY, stageInitX, stageInitY, stageInitWidth, stageInitHeight;
private final ObservableBooleanValue isDisplayScalingUniform;
private Rectangle2D currentMouseVisualBounds;

/**
* Constructor for all SkinBase instances.
Expand Down Expand Up @@ -89,6 +99,12 @@ public DecoratorSkin(Decorator control) {

skinnable.getSnackbar().registerSnackbarContainer(parent);

ObservableList<Screen> screens = Screen.getScreens();
isDisplayScalingUniform = Bindings.createBooleanBinding(() -> {
Screen firstScreen = screens.get(0);
return screens.stream().allMatch(screen -> Objects.equals(firstScreen.getOutputScaleX(), screen.getOutputScaleX()) && Objects.equals(firstScreen.getOutputScaleY(), screen.getOutputScaleY()));
}, screens);

EventHandler<MouseEvent> onMouseReleased = this::onMouseReleased;
EventHandler<MouseEvent> onMouseDragged = this::onMouseDragged;
EventHandler<MouseEvent> onMouseMoved = this::onMouseMoved;
Expand Down Expand Up @@ -453,8 +469,17 @@ private void onMouseDragged(MouseEvent mouseEvent) {
Cursor cursor = root.getCursor();
if (getSkinnable().isAllowMove()) {
if (cursor == Cursor.DEFAULT) {
primaryStage.setX(stageInitX + dx);
primaryStage.setY(stageInitY + dy);
if (!isDisplayScalingUniform.get()) {
primaryStage.setX(stageInitX + dx);
primaryStage.setY(stageInitY + dy);
} else {
if (currentMouseVisualBounds == null || !currentMouseVisualBounds.contains(mouseEvent.getScreenX(), mouseEvent.getScreenY())) {
currentMouseVisualBounds = Screen.getScreensForRectangle(new Rectangle2D(mouseEvent.getScreenX(), mouseEvent.getScreenY(), 1, 1)).get(0).getVisualBounds();
}
primaryStage.setX(stageInitX + dx);
primaryStage.setY(Math.max(Math.min(stageInitY + dy, currentMouseVisualBounds.getMaxY() - titleContainer.getHeight()), currentMouseVisualBounds.getMinY() - titleContainer.getHeight()));

}
mouseEvent.consume();
}
}
Expand Down