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

Show menu bar before creating a normal window. This prevents the miniaturize...

Show menu bar before creating a normal window. This prevents the miniaturize button from being hidden. Fixes bug 1088.
parent d58596e4
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -174,11 +174,6 @@ NSString *sessionsKey = @"sessions";
self = [super initWithWindowNibName:@"PseudoTerminal"];
NSAssert(self, @"initWithWindowNibName returned nil");
 
// Force the nib to load
[self window];
[commandField retain];
[commandField setDelegate:self];
[bottomBar retain];
if (windowType == WINDOW_TYPE_FULL_SCREEN && screenNumber == -1) {
NSUInteger n = [[NSScreen screens] indexOfObjectIdenticalTo:[[self window] screen]];
if (n == NSNotFound) {
Loading
Loading
@@ -190,6 +185,17 @@ NSString *sessionsKey = @"sessions";
if (windowType == WINDOW_TYPE_TOP) {
smartLayout = NO;
}
if (windowType == WINDOW_TYPE_NORMAL) {
// If you create a window with a minimize button and the menu bar is hidden then the
// minimize button is disabled. Currently the only window type with a miniaturize button
// is NORMAL.
[NSMenu setMenuBarVisible:YES];
}
// Force the nib to load
[self window];
[commandField retain];
[commandField setDelegate:self];
[bottomBar retain];
windowType_ = windowType;
pbHistoryView = [[PasteboardHistoryView alloc] init];
autocompleteView = [[AutocompleteView alloc] init];
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