AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-18 08:16:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #417 from tsl0922/osx-maximized

Browse Source 
Mac 下恢复使用自定义窗口边框按钮
This commit is contained in:
Haowei Wen 2018-08-10 08:26:56 +08:00 committed by GitHub
commit 13c48ce78c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
View File

@ -171,14 +171,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
onCloseButtonAction = new SimpleObjectProperty<>(this, "onCloseButtonAction", Launcher::stopApplication); onCloseButtonAction = new SimpleObjectProperty<>(this, "onCloseButtonAction", Launcher::stopApplication);
switch (OperatingSystem.CURRENT_OS) { primaryStage.initStyle(StageStyle.UNDECORATED);
case OSX:
titleContainer.setRight(null);
break;
default:
primaryStage.initStyle(StageStyle.UNDECORATED);
break;
}
btnClose.setGraphic(close); btnClose.setGraphic(close);
btnMin.setGraphic(minus); btnMin.setGraphic(minus);
btnMax.setGraphic(resizeMax); btnMax.setGraphic(resizeMax);
@ -310,11 +303,22 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
} }
return Optional.empty(); return Optional.empty();
} }
private boolean isMaximized() {
switch (OperatingSystem.CURRENT_OS) {
case OSX:
Rectangle2D bounds = Screen.getPrimary().getVisualBounds();
return primaryStage.getWidth() >= bounds.getWidth() && primaryStage.getHeight() >= bounds.getHeight();
default:
return primaryStage.isMaximized();
}
}
// ==== // ====
@FXML @FXML
private void onMouseMoved(MouseEvent mouseEvent) { private void onMouseMoved(MouseEvent mouseEvent) {
if (!primaryStage.isMaximized() && !primaryStage.isFullScreen() && !maximized) { if (!isMaximized() && !primaryStage.isFullScreen() && !maximized) {
if (!primaryStage.isResizable()) if (!primaryStage.isResizable())
updateInitMouseValues(mouseEvent); updateInitMouseValues(mouseEvent);
else { else {
@ -363,7 +367,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
private void onMouseDragged(MouseEvent mouseEvent) { private void onMouseDragged(MouseEvent mouseEvent) {
this.isDragging = true; this.isDragging = true;
if (mouseEvent.isPrimaryButtonDown() && (this.xOffset != -1.0 || this.yOffset != -1.0)) { if (mouseEvent.isPrimaryButtonDown() && (this.xOffset != -1.0 || this.yOffset != -1.0)) {
if (!this.primaryStage.isFullScreen() && !mouseEvent.isStillSincePress() && !this.primaryStage.isMaximized() && !this.maximized) { if (!this.primaryStage.isFullScreen() && !mouseEvent.isStillSincePress() && !isMaximized() && !this.maximized) {
this.newX = mouseEvent.getScreenX(); this.newX = mouseEvent.getScreenX();
this.newY = mouseEvent.getScreenY(); this.newY = mouseEvent.getScreenY();
double deltaX = this.newX - this.initX; double deltaX = this.newX - this.initX;