< prev index next >
src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
Print this page
@@ -178,10 +178,11 @@
@synthesize styleBits;
@synthesize isEnabled;
@synthesize ownerWindow;
@synthesize preFullScreenLevel;
@synthesize standardFrame;
+@synthesize isMinimizing;
- (void) updateMinMaxSize:(BOOL)resizable {
if (resizable) {
[self.nsWindow setMinSize:self.javaMinSize];
[self.nsWindow setMaxSize:self.javaMaxSize];
@@ -302,10 +303,11 @@
if (self.nsWindow == nil) return nil; // no hope either
[self.nsWindow release]; // the property retains the object already
self.isEnabled = YES;
+ self.isMinimizing = NO;
self.javaPlatformWindow = platformWindow;
self.styleBits = bits;
self.ownerWindow = owner;
[self setPropertiesForStyleBits:styleBits mask:MASK(_METHOD_PROP_BITMASK)];
@@ -421,10 +423,72 @@
self.nsWindow = nil;
self.ownerWindow = nil;
[super dealloc];
}
+// Tests wheather the corresponding Java paltform window is visible or not
++ (BOOL) isJavaPlatformWindowVisible:(NSWindow *)window {
+ BOOL isVisible = NO;
+
+ if ([AWTWindow isAWTWindow:window] && [window delegate] != nil) {
+ AWTWindow *awtWindow = (AWTWindow *)[window delegate];
+ [AWTToolkit eventCountPlusPlus];
+
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ jobject platformWindow = [awtWindow.javaPlatformWindow jObjectWithEnv:env];
+ if (platformWindow != NULL) {
+ static JNF_MEMBER_CACHE(jm_isVisible, jc_CPlatformWindow, "isVisible", "()Z");
+ isVisible = JNFCallBooleanMethod(env, platformWindow, jm_isVisible) == JNI_TRUE ? YES : NO;
+ (*env)->DeleteLocalRef(env, platformWindow);
+
+ }
+ }
+ return isVisible;
+}
+
+// Orders window's childs based on the current focus state
+- (void) orderChildWindows:(BOOL)focus {
+AWT_ASSERT_APPKIT_THREAD;
+
+ if (self.isMinimizing) {
+ // Do not perform any ordering, if iconify is in progress
+ return;
+ }
+
+ NSEnumerator *windowEnumerator = [[NSApp windows]objectEnumerator];
+ NSWindow *window;
+ while ((window = [windowEnumerator nextObject]) != nil) {
+ if ([AWTWindow isJavaPlatformWindowVisible:window]) {
+ AWTWindow *awtWindow = (AWTWindow *)[window delegate];
+ AWTWindow *owner = awtWindow.ownerWindow;
+ if (IS(awtWindow.styleBits, ALWAYS_ON_TOP)) {
+ // Do not order 'always on top' windows
+ continue;
+ }
+ while (awtWindow.ownerWindow != nil) {
+ if (awtWindow.ownerWindow == self) {
+ if (focus) {
+ // Move the childWindow to floating level
+ // so it will appear in front of its
+ // parent which owns the focus
+ [window setLevel:NSFloatingWindowLevel];
+ } else {
+ // Focus owner has changed, move the childWindow
+ // back to normal window level
+ [window setLevel:NSNormalWindowLevel];
+ }
+ // The childWindow should be displayed in front of
+ // its nearest parentWindow
+ [window orderWindow:NSWindowAbove relativeTo:[owner.nsWindow windowNumber]];
+ break;
+ }
+ awtWindow = awtWindow.ownerWindow;
+ }
+ }
+ }
+}
+
// NSWindow overrides
- (BOOL) canBecomeKeyWindow {
AWT_ASSERT_APPKIT_THREAD;
return self.isEnabled && IS(self.styleBits, SHOULD_BECOME_KEY);
}
@@ -509,10 +573,34 @@
defaultFrame:(NSRect)newFrame {
return [self standardFrame];
}
+// Hides/shows window's childs during iconify/de-iconify operation
+- (void) iconifyChildWindows:(BOOL)iconify {
+AWT_ASSERT_APPKIT_THREAD;
+
+ NSEnumerator *windowEnumerator = [[NSApp windows]objectEnumerator];
+ NSWindow *window;
+ while ((window = [windowEnumerator nextObject]) != nil) {
+ if ([AWTWindow isJavaPlatformWindowVisible:window]) {
+ AWTWindow *awtWindow = (AWTWindow *)[window delegate];
+ while (awtWindow.ownerWindow != nil) {
+ if (awtWindow.ownerWindow == self) {
+ if (iconify) {
+ [window orderOut:window];
+ } else {
+ [window orderFront:window];
+ }
+ break;
+ }
+ awtWindow = awtWindow.ownerWindow;
+ }
+ }
+ }
+}
+
- (void) _deliverIconify:(BOOL)iconify {
AWT_ASSERT_APPKIT_THREAD;
[AWTToolkit eventCountPlusPlus];
JNIEnv *env = [ThreadUtilities getJNIEnv];
@@ -522,20 +610,32 @@
JNFCallVoidMethod(env, platformWindow, jm_deliverIconify, iconify);
(*env)->DeleteLocalRef(env, platformWindow);
}
}
+- (void)windowWillMiniaturize:(NSNotification *)notification {
+AWT_ASSERT_APPKIT_THREAD;
+
+ self.isMinimizing = YES;
+ // Excplicitly make myself a key window to avoid possible
+ // negative visual effects during iconify operation
+ [self.nsWindow makeKeyAndOrderFront:self.nsWindow];
+ [self iconifyChildWindows:YES];
+}
+
- (void)windowDidMiniaturize:(NSNotification *)notification {
AWT_ASSERT_APPKIT_THREAD;
[self _deliverIconify:JNI_TRUE];
+ self.isMinimizing = NO;
}
- (void)windowDidDeminiaturize:(NSNotification *)notification {
AWT_ASSERT_APPKIT_THREAD;
[self _deliverIconify:JNI_FALSE];
+ [self iconifyChildWindows:NO];
}
- (void) _deliverWindowFocusEvent:(BOOL)focused oppositeWindow:(AWTWindow *)opposite {
//AWT_ASSERT_APPKIT_THREAD;
JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
@@ -577,10 +677,11 @@
[CMenuBar activate:menuBar modallyDisabled:isDisabled];
[AWTWindow setLastKeyWindow:nil];
[self _deliverWindowFocusEvent:YES oppositeWindow: opposite];
+ [self orderChildWindows:YES];
}
- (void) windowDidResignKey: (NSNotification *) notification {
// TODO: check why sometimes at start is invoked *not* on AppKit main thread.
AWT_ASSERT_APPKIT_THREAD;
@@ -604,10 +705,11 @@
} else {
[AWTWindow setLastKeyWindow: nil];
}
[self _deliverWindowFocusEvent:NO oppositeWindow: opposite];
+ [self orderChildWindows:NO];
}
- (void) windowDidBecomeMain: (NSNotification *) notification {
AWT_ASSERT_APPKIT_THREAD;
[AWTToolkit eventCountPlusPlus];
< prev index next >