Starting to add toolbar show/hide for bookmarsk toolbar.

camino/BrowserWindowController.mm

@@ -300,7 +300,6 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
                                         ForwardToolbarItemIdentifier,
                                         ReloadToolbarItemIdentifier,
                                         StopToolbarItemIdentifier,
-                                        HomeToolbarItemIdentifier,
                                         LocationToolbarItemIdentifier,
                                         SidebarToolbarItemIdentifier,
                                         nil];

camino/CHBookmarksToolbar.h

@@ -43,4 +43,6 @@ class BookmarksService;
 -(void)reflowButtons;
 -(void)reflowButtonsStartingAtIndex: (int)aIndex;
 
+-(void)showBookmarksToolbar: (BOOL)aShow;
+
 @end

camino/CHBookmarksToolbar.mm

@@ -193,7 +193,7 @@
   NSRect oldFrame = [self frame];
   [super setFrame:aRect];
 
-  if (oldFrame.size.width == aRect.size.width)
+  if (oldFrame.size.width == aRect.size.width || aRect.size.height == 0)
     return;
 
   int count = [mButtons count];
@@ -224,4 +224,20 @@
   }
 }
 
+-(void)showBookmarksToolbar: (BOOL)aShow
+{
+  if (!aShow) {
+    float height = [self bounds].size.height;
+    [self setFrame: NSMakeRect([self frame].origin.x, [self frame].origin.y + height,
+                               [self frame].size.width, 0)];
+    // We need to adjust the content area.
+    NSView* view = [[[self window] windowController] getTabBrowser];
+    [view setFrame: NSMakeRect([view frame].origin.x, [view frame].origin.y,
+                               [view frame].size.width, [view frame].size.height + height)];
+  }
+  //else
+    // Reflowing the buttons will do the right thing.
+  //  [self reflowButtons];
+}
+
 @end

camino/MainController.h

@@ -90,6 +90,7 @@ class BookmarksService;
 -(IBAction) nextTab:(id)aSender;
 
 // View menu actions.
+-(IBAction) toggleBookmarksToolbar:(id)aSender;
 -(IBAction) doReload:(id)aSender;
 -(IBAction) doStop:(id)aSender;
 -(IBAction) biggerTextSize:(id)aSender;

camino/src/application/MainController.h

@@ -90,6 +90,7 @@ class BookmarksService;
 -(IBAction) nextTab:(id)aSender;
 
 // View menu actions.
+-(IBAction) toggleBookmarksToolbar:(id)aSender;
 -(IBAction) doReload:(id)aSender;
 -(IBAction) doStop:(id)aSender;
 -(IBAction) biggerTextSize:(id)aSender;

camino/src/bookmarks/BookmarksToolbar.h

@@ -43,4 +43,6 @@ class BookmarksService;
 -(void)reflowButtons;
 -(void)reflowButtonsStartingAtIndex: (int)aIndex;
 
+-(void)showBookmarksToolbar: (BOOL)aShow;
+
 @end

camino/src/bookmarks/BookmarksToolbar.mm

@@ -193,7 +193,7 @@
   NSRect oldFrame = [self frame];
   [super setFrame:aRect];
 
-  if (oldFrame.size.width == aRect.size.width)
+  if (oldFrame.size.width == aRect.size.width || aRect.size.height == 0)
     return;
 
   int count = [mButtons count];
@@ -224,4 +224,20 @@
   }
 }
 
+-(void)showBookmarksToolbar: (BOOL)aShow
+{
+  if (!aShow) {
+    float height = [self bounds].size.height;
+    [self setFrame: NSMakeRect([self frame].origin.x, [self frame].origin.y + height,
+                               [self frame].size.width, 0)];
+    // We need to adjust the content area.
+    NSView* view = [[[self window] windowController] getTabBrowser];
+    [view setFrame: NSMakeRect([view frame].origin.x, [view frame].origin.y,
+                               [view frame].size.width, [view frame].size.height + height)];
+  }
+  //else
+    // Reflowing the buttons will do the right thing.
+  //  [self reflowButtons];
+}
+
 @end

camino/src/browser/BrowserWindowController.mm

@@ -300,7 +300,6 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
                                         ForwardToolbarItemIdentifier,
                                         ReloadToolbarItemIdentifier,
                                         StopToolbarItemIdentifier,
-                                        HomeToolbarItemIdentifier,
                                         LocationToolbarItemIdentifier,
                                         SidebarToolbarItemIdentifier,
                                         nil];

chimera/BrowserWindowController.mm

@@ -300,7 +300,6 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
                                         ForwardToolbarItemIdentifier,
                                         ReloadToolbarItemIdentifier,
                                         StopToolbarItemIdentifier,
-                                        HomeToolbarItemIdentifier,
                                         LocationToolbarItemIdentifier,
                                         SidebarToolbarItemIdentifier,
                                         nil];

chimera/CHBookmarksToolbar.h

@@ -43,4 +43,6 @@ class BookmarksService;
 -(void)reflowButtons;
 -(void)reflowButtonsStartingAtIndex: (int)aIndex;
 
+-(void)showBookmarksToolbar: (BOOL)aShow;
+
 @end

chimera/CHBookmarksToolbar.mm

@@ -193,7 +193,7 @@
   NSRect oldFrame = [self frame];
   [super setFrame:aRect];
 
-  if (oldFrame.size.width == aRect.size.width)
+  if (oldFrame.size.width == aRect.size.width || aRect.size.height == 0)
     return;
 
   int count = [mButtons count];
@@ -224,4 +224,20 @@
   }
 }
 
+-(void)showBookmarksToolbar: (BOOL)aShow
+{
+  if (!aShow) {
+    float height = [self bounds].size.height;
+    [self setFrame: NSMakeRect([self frame].origin.x, [self frame].origin.y + height,
+                               [self frame].size.width, 0)];
+    // We need to adjust the content area.
+    NSView* view = [[[self window] windowController] getTabBrowser];
+    [view setFrame: NSMakeRect([view frame].origin.x, [view frame].origin.y,
+                               [view frame].size.width, [view frame].size.height + height)];
+  }
+  //else
+    // Reflowing the buttons will do the right thing.
+  //  [self reflowButtons];
+}
+
 @end

chimera/MainController.h

@@ -90,6 +90,7 @@ class BookmarksService;
 -(IBAction) nextTab:(id)aSender;
 
 // View menu actions.
+-(IBAction) toggleBookmarksToolbar:(id)aSender;
 -(IBAction) doReload:(id)aSender;
 -(IBAction) doStop:(id)aSender;
 -(IBAction) biggerTextSize:(id)aSender;

chimera/src/application/MainController.h

@@ -90,6 +90,7 @@ class BookmarksService;
 -(IBAction) nextTab:(id)aSender;
 
 // View menu actions.
+-(IBAction) toggleBookmarksToolbar:(id)aSender;
 -(IBAction) doReload:(id)aSender;
 -(IBAction) doStop:(id)aSender;
 -(IBAction) biggerTextSize:(id)aSender;

chimera/src/bookmarks/BookmarksToolbar.h

@@ -43,4 +43,6 @@ class BookmarksService;
 -(void)reflowButtons;
 -(void)reflowButtonsStartingAtIndex: (int)aIndex;
 
+-(void)showBookmarksToolbar: (BOOL)aShow;
+
 @end

chimera/src/bookmarks/BookmarksToolbar.mm

@@ -193,7 +193,7 @@
   NSRect oldFrame = [self frame];
   [super setFrame:aRect];
 
-  if (oldFrame.size.width == aRect.size.width)
+  if (oldFrame.size.width == aRect.size.width || aRect.size.height == 0)
     return;
 
   int count = [mButtons count];
@@ -224,4 +224,20 @@
   }
 }
 
+-(void)showBookmarksToolbar: (BOOL)aShow
+{
+  if (!aShow) {
+    float height = [self bounds].size.height;
+    [self setFrame: NSMakeRect([self frame].origin.x, [self frame].origin.y + height,
+                               [self frame].size.width, 0)];
+    // We need to adjust the content area.
+    NSView* view = [[[self window] windowController] getTabBrowser];
+    [view setFrame: NSMakeRect([view frame].origin.x, [view frame].origin.y,
+                               [view frame].size.width, [view frame].size.height + height)];
+  }
+  //else
+    // Reflowing the buttons will do the right thing.
+  //  [self reflowButtons];
+}
+
 @end

chimera/src/browser/BrowserWindowController.mm

@@ -300,7 +300,6 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
                                         ForwardToolbarItemIdentifier,
                                         ReloadToolbarItemIdentifier,
                                         StopToolbarItemIdentifier,
-                                        HomeToolbarItemIdentifier,
                                         LocationToolbarItemIdentifier,
                                         SidebarToolbarItemIdentifier,
                                         nil];