Merge branch 'master' of github.com:gnachman/iTerm2

PseudoTerminal.m

@@ -382,10 +382,15 @@ NSString *sessionsKey = @"sessions";
     NSRect aRect = [[[self window] contentView] bounds];
     aRect.size.height = 22;
     tabBarControl = [[PSMTabBarControl alloc] initWithFrame:aRect];
+
     [tabBarControl retain];
     PreferencePanel* pp = [PreferencePanel sharedInstance];
     [tabBarControl setModifier:[pp modifierTagToMask:[pp switchTabModifier]]];
-    [tabBarControl setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
+    if ([[PreferencePanel sharedInstance] tabViewType] == PSMTab_BottomTab) {
+        [tabBarControl setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
+    } else {
+        [tabBarControl setAutoresizingMask:(NSViewWidthSizable | NSViewMaxYMargin)];
+    }
     [[[self window] contentView] addSubview:tabBarControl];
     [tabBarControl release];
@@ -4020,6 +4025,7 @@ NSString *sessionsKey = @"sessions";
             aRect.origin.y += aRect.size.height;
             aRect.size.height = [tabBarControl frame].size.height;
             [tabBarControl setFrame:aRect];
+            [tabBarControl setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
         } else {
             PtyLog(@"repositionWidgets - putting tabs at bottom");
             // setup aRect to make room for the tabs at the bottom.
@@ -4032,6 +4038,7 @@ NSString *sessionsKey = @"sessions";
                 aRect.origin.y += [bottomBar frame].size.height;
             }
             [tabBarControl setFrame:aRect];
+            [tabBarControl setAutoresizingMask:(NSViewWidthSizable | NSViewMaxYMargin)];
             aRect.origin.y += [tabBarControl frame].size.height;
             aRect.size.height = [[thisWindow contentView] frame].size.height - aRect.origin.y;
             PtyLog(@"repositionWidgets - Set tab view size to %fx%f", aRect.size.width, aRect.size.height);

iTermController.m

@@ -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;
     }
@@ -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;
     }