Make bottom corners of panels not rounded on GTK.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright (c) 2012 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/ui/gtk/browser_window_gtk.h"
 
 #include <dlfcn.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 430 matching lines @@
   if (UsingCustomPopupFrame()) {
     DrawPopupFrame(cr, widget, event);
   } else {
     DrawCustomFrame(cr, widget, event);
   }
 
   DrawContentShadow(cr);
 
   cairo_destroy(cr);
 
-  if (UseCustomFrame() && !IsMaximized()) {
-    static NineBox* custom_frame_border = NULL;
-    if (!custom_frame_border) {
-      custom_frame_border = new NineBox(IDR_WINDOW_TOP_LEFT_CORNER,
-                                        IDR_WINDOW_TOP_CENTER,
-                                        IDR_WINDOW_TOP_RIGHT_CORNER,
-                                        IDR_WINDOW_LEFT_SIDE,
-                                        0,
-                                        IDR_WINDOW_RIGHT_SIDE,
-                                        IDR_WINDOW_BOTTOM_LEFT_CORNER,
-                                        IDR_WINDOW_BOTTOM_CENTER,
-                                        IDR_WINDOW_BOTTOM_RIGHT_CORNER);
-    }
-    custom_frame_border->RenderToWidget(widget);
-  }
+  if (UseCustomFrame() && !IsMaximized())
+    DrawCustomFrameBorder(widget);
 
   return FALSE;  // Allow subwidgets to paint.
 }
 
+void BrowserWindowGtk::DrawCustomFrameBorder(GtkWidget* widget) {
+  static NineBox* custom_frame_border = NULL;
+  if (!custom_frame_border) {
+    custom_frame_border = new NineBox(IDR_WINDOW_TOP_LEFT_CORNER,
+                                      IDR_WINDOW_TOP_CENTER,
+                                      IDR_WINDOW_TOP_RIGHT_CORNER,
+                                      IDR_WINDOW_LEFT_SIDE,
+                                      0,
+                                      IDR_WINDOW_RIGHT_SIDE,
+                                      IDR_WINDOW_BOTTOM_LEFT_CORNER,
+                                      IDR_WINDOW_BOTTOM_CENTER,
+                                      IDR_WINDOW_BOTTOM_RIGHT_CORNER);
+  }
+  custom_frame_border->RenderToWidget(widget);
+}
+
 void BrowserWindowGtk::DrawContentShadow(cairo_t* cr) {
   // Draw the shadow above the toolbar. Tabs on the tabstrip will draw over us.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   int left_x, top_y;
   gtk_widget_translate_coordinates(toolbar_->widget(),
       GTK_WIDGET(window_), 0, 0, &left_x,
       &top_y);
 
   GtkAllocation window_vbox_allocation;
   gtk_widget_get_allocation(window_vbox_, &window_vbox_allocation);
@@ skipping 1496 matching lines @@
 
   GdkColor border_color = theme_provider->GetBorderColor();
   gtk_widget_modify_bg(toolbar_border_, GTK_STATE_NORMAL, &border_color);
 }
 
 void BrowserWindowGtk::OnSizeChanged(int width, int height) {
   UpdateWindowShape(width, height);
 }
 
 void BrowserWindowGtk::UpdateWindowShape(int width, int height) {
+  GdkRegion* mask = GetWindowShape(width, height);
+  gdk_window_shape_combine_region(
+      gtk_widget_get_window(GTK_WIDGET(window_)), mask, 0, 0);
+  if (mask)
+    gdk_region_destroy(mask);
+
+  if (UseCustomFrame() && !IsFullscreen() && !IsMaximized()) {
+    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);
+  }
+}
+
+GdkRegion* BrowserWindowGtk::GetWindowShape(int width, int height) const {
   if (UseCustomFrame() && !IsFullscreen() && !IsMaximized()) {
     // Make the corners rounded.  We set a mask that includes most of the
     // window except for a few pixels in each corner.
     GdkRectangle top_top_rect = { 3, 0, width - 6, 1 };
     GdkRectangle top_mid_rect = { 1, 1, width - 2, 2 };
     GdkRectangle mid_rect = { 0, 3, width, height - 6 };
     // The bottom two rects are mirror images of the top two rects.
     GdkRectangle bot_mid_rect = top_mid_rect;
     bot_mid_rect.y = height - 3;
     GdkRectangle bot_bot_rect = top_top_rect;
     bot_bot_rect.y = height - 1;
     GdkRegion* mask = gdk_region_rectangle(&top_top_rect);
     gdk_region_union_with_rect(mask, &top_mid_rect);
     gdk_region_union_with_rect(mask, &mid_rect);
     gdk_region_union_with_rect(mask, &bot_mid_rect);
     gdk_region_union_with_rect(mask, &bot_bot_rect);
-    gdk_window_shape_combine_region(gtk_widget_get_window(GTK_WIDGET(window_)),
-                                    mask, 0, 0);
-    gdk_region_destroy(mask);
-    gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 1,
-        kFrameBorderThickness, kFrameBorderThickness, kFrameBorderThickness);
+    return mask;
   } else {

[Evan Stade, 2012/05/01 00:46:10]

seems this should now be combined with the if below it.

-    // XFCE disables the system decorations if there's an xshape set.

[jennb, 2012/05/01 01:01:30]

Do we want to keep this comment?

     if (UseCustomFrame()) {
       // Disable rounded corners.  Simply passing in a NULL region doesn't
       // seem to work on KWin, so manually set the shape to the whole window.
       GdkRectangle rect = { 0, 0, width, height };
       GdkRegion* mask = gdk_region_rectangle(&rect);
-      gdk_window_shape_combine_region(
-          gtk_widget_get_window(GTK_WIDGET(window_)), mask, 0, 0);
-      gdk_region_destroy(mask);
+      return mask;
     } else {
-      gdk_window_shape_combine_region(
-          gtk_widget_get_window(GTK_WIDGET(window_)), NULL, 0, 0);
+      return NULL;
     }
-    gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 0, 0, 0, 0);
   }
 }
 
 void BrowserWindowGtk::ConnectAccelerators() {
   accel_group_ = gtk_accel_group_new();
   gtk_window_add_accel_group(window_, accel_group_);
 
   AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance();
   for (AcceleratorsGtk::const_iterator iter = accelerators->begin();
        iter != accelerators->end(); ++iter) {
@@ skipping 544 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }