GTK: Add padding in a couple places on the toolbar.

chrome/browser/gtk/browser_titlebar.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 65 matching lines @@
 // margin of FrameBorderThickness + kClientEdgeThickness.  This offset is to
 // account for kClientEdgeThickness.
 const int kTabStripLeftPadding = 1;
 
 // Spacing between buttons of the titlebar.
 const int kButtonSpacing = 2;
 
 // Spacing around outside of titlebar buttons.
 const int kButtonOuterPadding = 2;
 
+// Spacing between tabstrip and window control buttons (when the window is
+// maximized).
+const int kMaximizedTabstripPadding = 16;
+
 gboolean OnMouseMoveEvent(GtkWidget* widget, GdkEventMotion* event,
                           BrowserWindowGtk* browser_window) {
   // Reset to the default mouse cursor.
   browser_window->ResetCustomFrameCursor();
   return TRUE;
 }
 
 GdkPixbuf* GetOTRAvatar() {
   static GdkPixbuf* otr_avatar = NULL;
   if (!otr_avatar) {
@@ skipping 379 matching lines @@
     } else {
       gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
           rb.GetPixbufNamed(IDR_PRODUCT_LOGO_16));
     }
     throbber_.Reset();
   }
 }
 
 void BrowserTitlebar::UpdateTitlebarAlignment() {
   if (browser_window_->browser()->type() == Browser::TYPE_NORMAL) {
-    if (using_custom_frame_ && !browser_window_->IsMaximized()) {
-      gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_),
-          kTitlebarHeight, 0, kTabStripLeftPadding, 0);
-    } else {
-      gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_), 0, 0,
-                                kTabStripLeftPadding, 0);
+    int top_padding = 0;
+    int side_padding = 0;
+    int vertical_offset = kNormalVerticalOffset;
+
+    if (using_custom_frame_) {
+      if (!browser_window_->IsMaximized()) {
+        top_padding = kTitlebarHeight;
+      } else if (using_custom_frame_ && browser_window_->IsMaximized()) {
+        vertical_offset = 0;
+        side_padding = kMaximizedTabstripPadding;
+      }
     }
 
-    if (using_custom_frame_) {
-      browser_window_->tabstrip()->SetVerticalOffset(
-          browser_window_->IsMaximized() ? 0 : kNormalVerticalOffset);
-    } else {
-      browser_window_->tabstrip()->SetVerticalOffset(kNormalVerticalOffset);
-    }
+    int right_padding = 0;
+    int left_padding = kTabStripLeftPadding;
+    if (titlebar_right_buttons_hbox_)
+      right_padding = side_padding;
+    if (titlebar_left_buttons_hbox_)
+      left_padding = side_padding;

[tony, 2010/07/01 05:04:13]

Heh, I bet this looks kind of weird with buttons on both sides.

+
+    gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_),
+                              top_padding, 0,
+                              left_padding, right_padding);
+    browser_window_->tabstrip()->SetVerticalOffset(vertical_offset);
   } else {
     if (using_custom_frame_ && !browser_window_->IsFullscreen()) {
       gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_),
           kAppModePaddingTop, kAppModePaddingBottom, kAppModePaddingLeft, 0);
       gtk_widget_show(titlebar_alignment_);
     } else {
       gtk_widget_hide(titlebar_alignment_);
     }
   }
 
@@ skipping 306 matching lines @@
     menus::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }