Skip to content
Snippets Groups Projects
Commit 3b41a2dd authored by George Nachman's avatar George Nachman
Browse files

Fix bug 1490, where the findbar would become the first responder for...

Fix bug 1490, where the findbar would become the first responder for fullscreen hotkey windows, even when hidden! Also fix a bug where the first time you open a fullscreen hotkey window it immediately closes itself because it was first opened as a normal window and then toggled, but the toggling caused the previous app to  be restored because it looked like the window was closing.
parent ca166db2
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -846,13 +846,23 @@ static BOOL initDone = NO;
if (windowType == WINDOW_TYPE_LION_FULL_SCREEN && disableLionFullscreen) {
windowType = WINDOW_TYPE_FULL_SCREEN;
}
if (windowType == WINDOW_TYPE_FULL_SCREEN && disableLionFullscreen) {
// This is a shortcut to make fullscreen hotkey windows open
// directly in fullscreen mode.
windowType = WINDOW_TYPE_FORCE_FULL_SCREEN;
}
term = [[[PseudoTerminal alloc] initWithSmartLayout:YES
windowType:windowType
screen:[aDict objectForKey:KEY_SCREEN] ? [[aDict objectForKey:KEY_SCREEN] intValue] : -1
isHotkey:disableLionFullscreen] autorelease];
[self addInTerminals:term];
toggle = ([term windowType] == WINDOW_TYPE_FULL_SCREEN) ||
([term windowType] == WINDOW_TYPE_LION_FULL_SCREEN);
if (disableLionFullscreen) {
// See comment above regarding hotkey windows.
toggle = NO;
} else {
toggle = ([term windowType] == WINDOW_TYPE_FULL_SCREEN) ||
([term windowType] == WINDOW_TYPE_LION_FULL_SCREEN);
}
} else {
term = theTerm;
}
Loading
Loading
@@ -1187,6 +1197,9 @@ static void RollInHotkeyTerm(PseudoTerminal* term)
case WINDOW_TYPE_FULL_SCREEN:
[[NSAnimationContext currentContext] setDuration:[[PreferencePanel sharedInstance] hotkeyTermAnimationDuration]];
[[[term window] animator] setAlphaValue:1];
[[term window] makeKeyAndOrderFront:nil];
// This prevents the findbar, when hidden, from taking focus (bug 1490)
[[term currentSession] takeFocus];
[term hideMenuBar];
break;
}
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment