...

atg · Jul 9, 2010 · 31c719e · 31c719e
1 parent b54ee19
commit 31c719e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/IGKFindWindow.m b/IGKFindWindow.m
@@ -67,14 +67,16 @@ - (void)becomeKeyWindow
 	[super becomeKeyWindow];
 
 	//If this window becomes key, we should make the parent window main
-	[[self parentWindow] makeMainWindow];
+	if ([[self parentWindow] canBecomeMainWindow])
+		[[self parentWindow] makeMainWindow];
 }
 - (void)becomeMainWindow
 {
 	[super becomeMainWindow];
 
 	//Ditto here. For some reason Apple sends -becomeKeyWindow first then -becomeMainWindow
-	[[self parentWindow] makeMainWindow];
+	if ([[self parentWindow] canBecomeMainWindow])
+		[[self parentWindow] makeMainWindow];
 }
 
 - (BOOL)canBecomeKeyWindow

diff --git a/IGKWindowController.m b/IGKWindowController.m
@@ -2201,7 +2201,9 @@ - (IBAction)doFindPanelAction:(id)sender
 	[findWindow setParentWindow:[self actualWindow]];
 	[[[[findWindow contentView] subviews] lastObject] viewDidMoveToParentWindow:[self actualWindow]];
 	[findWindow makeKeyAndOrderFront:nil];
-	[[self actualWindow] makeMainWindow];
+
+	if (!isInFullscreen)
+		[[self actualWindow] makeMainWindow];
 }
 - (IBAction)closeFindPanel:(id)sender
 {