GTK custom frame: Don't show the border when maximized. Enlarge the close but...

chrome/browser/gtk/browser_titlebar.cc

 // Copyright (c) 2009 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 <gtk/gtk.h>
 
 #include "app/resource_bundle.h"
 #include "app/l10n_util.h"
@@ skipping 23 matching lines @@
 // that it doesn't extend into the "3D edge" portion of the titlebar.
 const int kOTRMaximizedTopSpacing = 2;
 // The OTR avatar ends 2 px above the bottom of the tabstrip (which, given the
 // way the tabstrip draws its bottom edge, will appear like a 1 px gap to the
 // user).
 const int kOTRBottomSpacing = 2;
 // There are 2 px on each side of the OTR avatar (between the frame border and
 // it on the left, and between it and the tabstrip on the right).
 const int kOTRSideSpacing = 2;
 
+// The thickness of the custom frame border; we need it here to enlarge the
+// close button whent the custom frame border isn't showing but the custom
+// titlebar is showing.
+const int kFrameBorderThickness = 4;
+
 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 63 matching lines @@
   restore_button_.reset(BuildTitlebarButton(IDR_RESTORE, IDR_RESTORE_P,
                         IDR_RESTORE_H, buttons_hbox,
                         IDS_XPFRAME_RESTORE_TOOLTIP));
   maximize_button_.reset(BuildTitlebarButton(IDR_MAXIMIZE, IDR_MAXIMIZE_P,
                          IDR_MAXIMIZE_H, buttons_hbox,
                          IDS_XPFRAME_MAXIMIZE_TOOLTIP));
   minimize_button_.reset(BuildTitlebarButton(IDR_MINIMIZE, IDR_MINIMIZE_P,
                          IDR_MINIMIZE_H, buttons_hbox,
                          IDS_XPFRAME_MINIMIZE_TOOLTIP));
 
+  GtkRequisition req;
+  gtk_widget_size_request(close_button_->widget(), &req);
+  close_button_default_width_ = req.width;
+
   gtk_box_pack_end(GTK_BOX(container_), titlebar_buttons_box_, FALSE,
                    FALSE, 0);
 
   gtk_widget_show_all(container_);
 }
 
 CustomDrawButton* BrowserTitlebar::BuildTitlebarButton(int image,
     int image_pressed, int image_hot, GtkWidget* box, int tooltip) {
   CustomDrawButton* button = new CustomDrawButton(image, image_pressed,
       image_hot, 0);
@@ skipping 18 matching lines @@
   UpdateTitlebarAlignment();
 }
 
 void BrowserTitlebar::UpdateTitlebarAlignment() {
   if (using_custom_frame_ && !browser_window_->IsMaximized()) {
     gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_),
         kTitlebarHeight, 0, 0, 0);
   } else {
     gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_), 0, 0, 0, 0);
   }
+
+  int close_button_width = close_button_default_width_;
+  if (using_custom_frame_ && browser_window_->IsMaximized())
+    close_button_width += kFrameBorderThickness;
+  gtk_widget_set_size_request(close_button_->widget(), close_button_width, -1);
 }
 
 // static
 gboolean BrowserTitlebar::OnWindowStateChanged(GtkWindow* window,
     GdkEventWindowState* event, BrowserTitlebar* titlebar) {
   // Update the maximize/restore button.
   if (titlebar->browser_window_->IsMaximized()) {
     gtk_widget_hide(titlebar->maximize_button_->widget());
     gtk_widget_show(titlebar->restore_button_->widget());
   } else {
@@ skipping 82 matching lines @@
       PrefService* prefs = browser_window_->browser()->profile()->GetPrefs();
       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
                         !prefs->GetBoolean(prefs::kUseCustomChromeFrame));
       break;
     }
 
     default:
       NOTREACHED();
   }
 }