infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-24 13:51:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

7193214: Consider simplifying CPlatformWindow.setResizable()

Browse Source 
Reviewed-by: anthony, denis
This commit is contained in:
Sergey Bylokhov 2012-11-21 15:54:41 +04:00
parent 27d64e18d2
commit 6a2db1d680
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
View File

@ -257,7 +257,7 @@ public final class CPlatformWindow extends CFRetainedResource implements Platfor
validateSurface();
}
protected int getInitialStyleBits() {
private int getInitialStyleBits() {
// defaults style bits
int styleBits = DECORATED | HAS_SHADOW | CLOSEABLE | MINIMIZABLE | ZOOMABLE | RESIZABLE;
@ -284,7 +284,6 @@ public final class CPlatformWindow extends CFRetainedResource implements Platfor
final boolean resizable = isFrame ? ((Frame)target).isResizable() : (isDialog ? ((Dialog)target).isResizable() : false);
styleBits = SET(styleBits, RESIZABLE, resizable);
if (!resizable) {
styleBits = SET(styleBits, RESIZABLE, false);
styleBits = SET(styleBits, ZOOMABLE, false);
}
}
@ -379,7 +378,7 @@ public final class CPlatformWindow extends CFRetainedResource implements Platfor
}
// this is the counter-point to -[CWindow _nativeSetStyleBit:]
protected void setStyleBits(final int mask, final boolean value) {
private void setStyleBits(final int mask, final boolean value) {
nativeSetNSWindowStyleBits(getNSWindowPtr(), mask, value ? mask : 0);
}
@ -656,15 +655,8 @@ public final class CPlatformWindow extends CFRetainedResource implements Platfor
}
@Override
public void setResizable(boolean resizable) {
public void setResizable(final boolean resizable) {
setStyleBits(RESIZABLE, resizable);
// Re-apply the size constraints and the size to ensure the space
// occupied by the grow box is counted properly
peer.updateMinimumSize();
Rectangle bounds = peer.getBounds();
setBounds(bounds.x, bounds.y, bounds.width, bounds.height);
}
@Override

6
jdk/src/macosx/native/sun/awt/AWTWindow.m
View File

@ -160,6 +160,10 @@ AWT_NS_WINDOW_IMPLEMENTATION
BOOL resizable = IS(bits, RESIZABLE);
[self updateMinMaxSize:resizable];
[self.nsWindow setShowsResizeIndicator:resizable];
// Zoom button should be disabled, if the window is not resizable,
// otherwise button should be restored to initial state.
BOOL zoom = resizable && IS(bits, ZOOMABLE);
[[self.nsWindow standardWindowButton:NSWindowZoomButton] setEnabled:zoom];
}
if (IS(mask, HAS_SHADOW)) {
@ -784,7 +788,7 @@ AWT_ASSERT_NOT_APPKIT_THREAD;
// calls methods on NSWindow to change other properties, based on the mask
if (mask & MASK(_METHOD_PROP_BITMASK)) {
[window setPropertiesForStyleBits:bits mask:mask];
[window setPropertiesForStyleBits:newBits mask:mask];
}
window.styleBits = newBits;