Skip to content

8364547: Window size may be incorrect when constrained to min or max #1870

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 5 commits into
base: master
Choose a base branch
from
Open

8364547: Window size may be incorrect when constrained to min or max #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96bf8d8
Notify WindowStage if setBounds didn't change the size as expected
beldenfox Apr 30, 2025
5de1c38
Comment cleanup
beldenfox Apr 30, 2025
5907c0c
Merge remote-tracking branch 'upstream/master' into sendcorrectsize
beldenfox Aug 1, 2025
1c45278
If min/max window size enforced send notification to correct Window p…
beldenfox Aug 12, 2025
468fd35
Remove double notifications, keep window min/max/normal state unchanged.
beldenfox Aug 18, 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
15 changes: 15 additions & 0 deletions modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/
package com.sun.glass.ui.win;

import com.sun.glass.events.WindowEvent;
import com.sun.glass.ui.Cursor;
import com.sun.glass.ui.HeaderButtonMetrics;
import com.sun.glass.ui.HeaderButtonOverlay;
Expand Down Expand Up @@ -122,8 +123,11 @@ public void setBounds(float x, float y, boolean xSet, boolean ySet,
fxReqHeight = fx_ch;

int maxW = getMaximumWidth(), maxH = getMaximumHeight();
int oldPw = pw;
int oldPh = ph;
pw = Math.max(Math.min(pw, maxW > 0 ? maxW : Integer.MAX_VALUE), getMinimumWidth());
ph = Math.max(Math.min(ph, maxH > 0 ? maxH : Integer.MAX_VALUE), getMinimumHeight());
boolean minMaxEnforced = (oldPw != pw || oldPh != ph);

long anchor = _getAnchor(getRawHandle());
int resizeMode = (anchor == ANCHOR_NO_CAPTURE)
Expand All @@ -150,7 +154,18 @@ public void setBounds(float x, float y, boolean xSet, boolean ySet,
if (!ySet) ySet = (py != this.y);
pfReqWidth = (int) Math.ceil(fxReqWidth * platformScaleX);
pfReqHeight = (int) Math.ceil(fxReqHeight * platformScaleY);
boolean alreadyAtSize = (pw == width && ph == height);
_setBounds(getRawHandle(), px, py, xSet, ySet, pw, ph, 0, 0, xGravity, yGravity);

if (minMaxEnforced && alreadyAtSize) {
var eventType = WindowEvent.RESIZE;
if (isMaximized()) {
eventType = WindowEvent.MAXIMIZE;
} else if (isMinimized()) {
eventType = WindowEvent.MINIMIZE;
}
notifyResize(eventType, pw, ph);
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions modules/javafx.graphics/src/main/native-glass/mac/GlassWindow+Java.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,12 @@ - (void)_setBounds:(jint)x y:(jint)y xSet:(jboolean)xSet ySet:(jboolean)ySet w:(
// as it is possible that the windowDidMove event is not triggered.
[self _sendJavaWindowMoveEventForFrame:flipFrame];
}
if (newW != flipFrame.size.width || newH != flipFrame.size.height) {
// The frame may not have changed due min/max limits. In that case we
// need to send back the actual size since the windowDidResize
// notification was not triggered.
[self _sendJavaWindowResizeEvent:com_sun_glass_events_WindowEvent_RESIZE forFrame:flipFrame];
}
}

- (void)_restorePreZoomedRect
Expand Down