diff --git a/camino/BrowserWindow.nib/info.nib b/camino/BrowserWindow.nib/info.nib index 79cd7c555c17..8959639e0f81 100644 --- a/camino/BrowserWindow.nib/info.nib +++ b/camino/BrowserWindow.nib/info.nib @@ -38,8 +38,10 @@ IBLastGroupID 4 IBLockedObjects + + IBOpenObjects - 497 + 10 IBSystem Version 5S66 diff --git a/camino/BrowserWindow.nib/objects.nib b/camino/BrowserWindow.nib/objects.nib index 47d13acffc5c..9cfa93c5839d 100644 Binary files a/camino/BrowserWindow.nib/objects.nib and b/camino/BrowserWindow.nib/objects.nib differ diff --git a/camino/BrowserWindowController.mm b/camino/BrowserWindowController.mm index 0dff3397c927..ba7eb92d048a 100644 --- a/camino/BrowserWindowController.mm +++ b/camino/BrowserWindowController.mm @@ -252,16 +252,11 @@ static NSArray* sToolbarDefaults = nil; [[self window] setShowsResizeIndicator:NO]; if ( mChromeMask && !(mChromeMask & nsIWebBrowserChrome::CHROME_STATUSBAR) ) { - // remove the status bar at the bottom and adjust the height of the content area. We - // have to turn off the autoresizing min flag to correctly pull the tab browser to - // the bottom of the window while we're resizing it. + // remove the status bar at the bottom and adjust the height of the content area. float height = [mStatusBar frame].size.height; [mStatusBar removeFromSuperview]; - int mask = [mTabBrowser autoresizingMask]; - [mTabBrowser setAutoresizingMask:(mask & !NSViewMinYMargin)]; [mTabBrowser setFrame:NSMakeRect([mTabBrowser frame].origin.x, [mTabBrowser frame].origin.y - height, [mTabBrowser frame].size.width, [mTabBrowser frame].size.height + height)]; - [mTabBrowser setAutoresizingMask:mask]; // clear out everything in the status bar we were holding on to. This will cause us to // pass nil for these status items into the CHBrowserwWrapper which is what we want. We'll diff --git a/camino/English.lproj/BrowserWindow.nib/info.nib b/camino/English.lproj/BrowserWindow.nib/info.nib index 79cd7c555c17..8959639e0f81 100644 --- a/camino/English.lproj/BrowserWindow.nib/info.nib +++ b/camino/English.lproj/BrowserWindow.nib/info.nib @@ -38,8 +38,10 @@ IBLastGroupID 4 IBLockedObjects + + IBOpenObjects - 497 + 10 IBSystem Version 5S66 diff --git a/camino/English.lproj/BrowserWindow.nib/objects.nib b/camino/English.lproj/BrowserWindow.nib/objects.nib index 47d13acffc5c..9cfa93c5839d 100644 Binary files a/camino/English.lproj/BrowserWindow.nib/objects.nib and b/camino/English.lproj/BrowserWindow.nib/objects.nib differ diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib index 79cd7c555c17..8959639e0f81 100644 --- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -38,8 +38,10 @@ IBLastGroupID 4 IBLockedObjects + + IBOpenObjects - 497 + 10 IBSystem Version 5S66 diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index 47d13acffc5c..9cfa93c5839d 100644 Binary files a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm index 0dff3397c927..ba7eb92d048a 100644 --- a/camino/src/browser/BrowserWindowController.mm +++ b/camino/src/browser/BrowserWindowController.mm @@ -252,16 +252,11 @@ static NSArray* sToolbarDefaults = nil; [[self window] setShowsResizeIndicator:NO]; if ( mChromeMask && !(mChromeMask & nsIWebBrowserChrome::CHROME_STATUSBAR) ) { - // remove the status bar at the bottom and adjust the height of the content area. We - // have to turn off the autoresizing min flag to correctly pull the tab browser to - // the bottom of the window while we're resizing it. + // remove the status bar at the bottom and adjust the height of the content area. float height = [mStatusBar frame].size.height; [mStatusBar removeFromSuperview]; - int mask = [mTabBrowser autoresizingMask]; - [mTabBrowser setAutoresizingMask:(mask & !NSViewMinYMargin)]; [mTabBrowser setFrame:NSMakeRect([mTabBrowser frame].origin.x, [mTabBrowser frame].origin.y - height, [mTabBrowser frame].size.width, [mTabBrowser frame].size.height + height)]; - [mTabBrowser setAutoresizingMask:mask]; // clear out everything in the status bar we were holding on to. This will cause us to // pass nil for these status items into the CHBrowserwWrapper which is what we want. We'll diff --git a/chimera/BrowserWindow.nib/info.nib b/chimera/BrowserWindow.nib/info.nib index 79cd7c555c17..8959639e0f81 100644 --- a/chimera/BrowserWindow.nib/info.nib +++ b/chimera/BrowserWindow.nib/info.nib @@ -38,8 +38,10 @@ IBLastGroupID 4 IBLockedObjects + + IBOpenObjects - 497 + 10 IBSystem Version 5S66 diff --git a/chimera/BrowserWindow.nib/objects.nib b/chimera/BrowserWindow.nib/objects.nib index 47d13acffc5c..9cfa93c5839d 100644 Binary files a/chimera/BrowserWindow.nib/objects.nib and b/chimera/BrowserWindow.nib/objects.nib differ diff --git a/chimera/BrowserWindowController.mm b/chimera/BrowserWindowController.mm index 0dff3397c927..ba7eb92d048a 100644 --- a/chimera/BrowserWindowController.mm +++ b/chimera/BrowserWindowController.mm @@ -252,16 +252,11 @@ static NSArray* sToolbarDefaults = nil; [[self window] setShowsResizeIndicator:NO]; if ( mChromeMask && !(mChromeMask & nsIWebBrowserChrome::CHROME_STATUSBAR) ) { - // remove the status bar at the bottom and adjust the height of the content area. We - // have to turn off the autoresizing min flag to correctly pull the tab browser to - // the bottom of the window while we're resizing it. + // remove the status bar at the bottom and adjust the height of the content area. float height = [mStatusBar frame].size.height; [mStatusBar removeFromSuperview]; - int mask = [mTabBrowser autoresizingMask]; - [mTabBrowser setAutoresizingMask:(mask & !NSViewMinYMargin)]; [mTabBrowser setFrame:NSMakeRect([mTabBrowser frame].origin.x, [mTabBrowser frame].origin.y - height, [mTabBrowser frame].size.width, [mTabBrowser frame].size.height + height)]; - [mTabBrowser setAutoresizingMask:mask]; // clear out everything in the status bar we were holding on to. This will cause us to // pass nil for these status items into the CHBrowserwWrapper which is what we want. We'll diff --git a/chimera/English.lproj/BrowserWindow.nib/info.nib b/chimera/English.lproj/BrowserWindow.nib/info.nib index 79cd7c555c17..8959639e0f81 100644 --- a/chimera/English.lproj/BrowserWindow.nib/info.nib +++ b/chimera/English.lproj/BrowserWindow.nib/info.nib @@ -38,8 +38,10 @@ IBLastGroupID 4 IBLockedObjects + + IBOpenObjects - 497 + 10 IBSystem Version 5S66 diff --git a/chimera/English.lproj/BrowserWindow.nib/objects.nib b/chimera/English.lproj/BrowserWindow.nib/objects.nib index 47d13acffc5c..9cfa93c5839d 100644 Binary files a/chimera/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/English.lproj/BrowserWindow.nib/objects.nib differ diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib index 79cd7c555c17..8959639e0f81 100644 --- a/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -38,8 +38,10 @@ IBLastGroupID 4 IBLockedObjects + + IBOpenObjects - 497 + 10 IBSystem Version 5S66 diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index 47d13acffc5c..9cfa93c5839d 100644 Binary files a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ diff --git a/chimera/src/browser/BrowserWindowController.mm b/chimera/src/browser/BrowserWindowController.mm index 0dff3397c927..ba7eb92d048a 100644 --- a/chimera/src/browser/BrowserWindowController.mm +++ b/chimera/src/browser/BrowserWindowController.mm @@ -252,16 +252,11 @@ static NSArray* sToolbarDefaults = nil; [[self window] setShowsResizeIndicator:NO]; if ( mChromeMask && !(mChromeMask & nsIWebBrowserChrome::CHROME_STATUSBAR) ) { - // remove the status bar at the bottom and adjust the height of the content area. We - // have to turn off the autoresizing min flag to correctly pull the tab browser to - // the bottom of the window while we're resizing it. + // remove the status bar at the bottom and adjust the height of the content area. float height = [mStatusBar frame].size.height; [mStatusBar removeFromSuperview]; - int mask = [mTabBrowser autoresizingMask]; - [mTabBrowser setAutoresizingMask:(mask & !NSViewMinYMargin)]; [mTabBrowser setFrame:NSMakeRect([mTabBrowser frame].origin.x, [mTabBrowser frame].origin.y - height, [mTabBrowser frame].size.width, [mTabBrowser frame].size.height + height)]; - [mTabBrowser setAutoresizingMask:mask]; // clear out everything in the status bar we were holding on to. This will cause us to // pass nil for these status items into the CHBrowserwWrapper which is what we want. We'll