[gtk] website settings bubble

chrome/browser/ui/gtk/bubble/bubble_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/bubble/bubble_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h"
@@ skipping 17 matching lines @@
 // window.
 const int kArrowX = 18;
 
 // Number of pixels between the tip of the arrow and the region we're
 // pointing to.
 const int kArrowToContentPadding = -4;
 
 // We draw flat diagonal corners, each corner is an NxN square.
 const int kCornerSize = 3;
 
-// Margins around the content.
-const int kTopMargin = kArrowSize + kCornerSize - 1;
-const int kBottomMargin = kCornerSize - 1;
-const int kLeftMargin = kCornerSize - 1;
-const int kRightMargin = kCornerSize - 1;
-
 const GdkColor kBackgroundColor = GDK_COLOR_RGB(0xff, 0xff, 0xff);
 const GdkColor kFrameColor = GDK_COLOR_RGB(0x63, 0x63, 0x63);
 
 // Helper functions that encapsulate arrow locations.
 bool HasArrow(BubbleGtk::ArrowLocationGtk location) {
   return location != BubbleGtk::ARROW_LOCATION_NONE &&
       location != BubbleGtk::ARROW_LOCATION_FLOAT;
 }
 
 bool IsArrowLeft(BubbleGtk::ArrowLocationGtk location) {
@@ skipping 100 matching lines @@
                             i->modifier_type,
                             GtkAccelFlags(0),
                             g_cclosure_new(G_CALLBACK(&OnGtkAcceleratorThunk),
                                            this,
                                            NULL));
   }
 
   gtk_window_add_accel_group(GTK_WINDOW(window_), accel_group_);
 
   GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
-  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
-                            kTopMargin, kBottomMargin,
-                            kLeftMargin, kRightMargin);
+  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), kArrowSize, 0, 0, 0);
 
   gtk_container_add(GTK_CONTAINER(alignment), content);
   gtk_container_add(GTK_CONTAINER(window_), alignment);
 
   // GtkWidget only exposes the bitmap mask interface.  Use GDK to more
   // efficently mask a GdkRegion.  Make sure the window is realized during
   // OnSizeAllocate, so the mask can be applied to the GdkWindow.
   gtk_widget_realize(window_);
 
   UpdateArrowLocation(true);  // Force move and reshape.
   StackWindow();
 
   gtk_widget_add_events(window_, GDK_BUTTON_PRESS_MASK);
 
-  signals_.Connect(window_, "expose-event", G_CALLBACK(OnExposeThunk), this);
+  // Connect during the bubbling phase so the border is always on top.
+  signals_.ConnectAfter(window_, "expose-event",
+                        G_CALLBACK(OnExposeThunk), this);
   signals_.Connect(window_, "size-allocate", G_CALLBACK(OnSizeAllocateThunk),
                    this);
   signals_.Connect(window_, "button-press-event",
                    G_CALLBACK(OnButtonPressThunk), this);
   signals_.Connect(window_, "destroy", G_CALLBACK(OnDestroyThunk), this);
   signals_.Connect(window_, "hide", G_CALLBACK(OnHideThunk), this);
 
   // If the toplevel window is being used as the anchor, then the signals below
   // are enough to keep us positioned correctly.
   if (anchor_widget_ != toplevel_window_) {
@@ skipping 475 matching lines @@
 gboolean BubbleGtk::OnToplevelUnmap(GtkWidget* widget, GdkEvent* event) {
   Close();
   return FALSE;
 }
 
 void BubbleGtk::OnAnchorAllocate(GtkWidget* widget,
                                  GtkAllocation* allocation) {
   if (!UpdateArrowLocation(false))
     MoveWindow();
 }