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

chrome/browser/gtk/browser_window_gtk.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_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/resource_bundle.h"
@@ skipping 397 matching lines @@
   ThemeProvider* theme_provider =
       window->browser()->profile()->GetThemeProvider();
   if (!default_background) {
     default_background = new NineBox(theme_provider,
         0, IDR_THEME_FRAME, 0, 0, 0, 0, 0, 0, 0);
     default_background_otr = new NineBox(theme_provider,
         0, IDR_THEME_FRAME_INCOGNITO, 0, 0, 0, 0, 0, 0, 0);
   }
 
   // Draw the default background.
-  // TODO(tc): Handle maximized windows.
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
   cairo_rectangle(cr, event->area.x, event->area.y, event->area.width,
                   event->area.height);
   cairo_clip(cr);
   NineBox* image = window->browser()->profile()->IsOffTheRecord()
       ? default_background_otr : default_background;
   image->RenderTopCenterStrip(cr, 0, 0, widget->allocation.width);
   cairo_destroy(cr);
 
   // TODO(tc): Draw the theme overlay.  The windows code is below.
   // if (theme_provider->HasCustomImage(IDR_THEME_FRAME_OVERLAY)) {
   //   SkBitmap* theme_overlay = theme_provider->GetBitmapNamed(
   //       IDR_THEME_FRAME_OVERLAY);
   //   canvas->DrawBitmapInt(*theme_overlay, 0, 0);
   // }
 
-  if (window->use_custom_frame_.GetValue()) {
+  if (window->use_custom_frame_.GetValue() && !window->IsMaximized()) {
     if (!custom_frame_border) {
       custom_frame_border = new NineBox(
           theme_provider,
           IDR_WINDOW_TOP_LEFT_CORNER,
           IDR_WINDOW_TOP_CENTER,
           IDR_WINDOW_TOP_RIGHT_CORNER,
           IDR_WINDOW_LEFT_SIDE,
           NULL,
           IDR_WINDOW_RIGHT_SIDE,
           IDR_WINDOW_BOTTOM_LEFT_CORNER,
@@ skipping 615 matching lines @@
     // Make the top corners rounded.  We set a mask that includes most of the
     // window except for a few pixels in the top two corners.
     GdkRectangle top_rect = { 3, 0, width - 6, 1 };
     GdkRectangle mid_rect = { 1, 1, width - 2, 2 };
     GdkRectangle bot_rect = { 0, 3, width, height - 3 };
     GdkRegion* mask = gdk_region_rectangle(&top_rect);
     gdk_region_union_with_rect(mask, &mid_rect);
     gdk_region_union_with_rect(mask, &bot_rect);
     gdk_window_shape_combine_region(GTK_WIDGET(window_)->window, mask, 0, 0);
     gdk_region_destroy(mask);
+    gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 1,
+        kFrameBorderThickness, kFrameBorderThickness, kFrameBorderThickness);
   } else {
     // Disable rounded corners.
     gdk_window_shape_combine_region(GTK_WIDGET(window_)->window, NULL, 0, 0);
+    gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 0, 0, 0, 0);
   }
 }
 
 void BrowserWindowGtk::ConnectAccelerators() {
   GtkAccelGroup* accel_group = gtk_accel_group_new();
   gtk_window_add_accel_group(window_, accel_group);
   // Drop the initial ref on |accel_group| so |window_| will own it.
   g_object_unref(accel_group);
 
   for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
     gtk_accel_group_connect(
         accel_group,
         kAcceleratorMap[i].keyval,
         kAcceleratorMap[i].modifier_type,
         GtkAccelFlags(0),
         g_cclosure_new(G_CALLBACK(OnGtkAccelerator), this, NULL));
   }
 }
 
 void BrowserWindowGtk::UpdateCustomFrame() {
   bool enable = use_custom_frame_.GetValue() && !full_screen_;
   gtk_window_set_decorated(window_, !enable);
   titlebar_->UpdateCustomFrame(enable);
   UpdateWindowShape(bounds_.width(), bounds_.height());
-  if (enable) {
-    gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 1,
-        kFrameBorderThickness, kFrameBorderThickness, kFrameBorderThickness);
-  } else {
-    gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 0, 0, 0, 0);
-  }
 }
 
 void BrowserWindowGtk::SaveWindowPosition() {
   // Browser::SaveWindowPlacement is used for session restore.
   if (browser_->ShouldSaveWindowPlacement())
     browser_->SaveWindowPlacement(bounds_, IsMaximized());
 
   // We also need to save the placement for startup.
   // This is a web of calls between views and delegates on Windows, but the
   // crux of the logic follows.  See also cocoa/browser_window_controller.mm.
@@ skipping 223 matching lines @@
       *edge = GDK_WINDOW_EDGE_NORTH_EAST;
     } else if (y < bounds_.height() - kResizeAreaCornerSize) {
       *edge = GDK_WINDOW_EDGE_EAST;
     } else {
       *edge = GDK_WINDOW_EDGE_SOUTH_EAST;
     }
     return true;
   }
   NOTREACHED();
 }