diff options
| -rw-r--r-- | chrome/browser/gtk/bookmark_bubble_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/content_blocked_bubble_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/extension_installed_bubble_gtk.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/gtk/first_run_bubble.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/info_bubble_gtk.cc | 8 |
5 files changed, 21 insertions, 5 deletions
diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc index 4c29a1b..52c851f 100644 --- a/chrome/browser/gtk/bookmark_bubble_gtk.cc +++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc @@ -33,6 +33,9 @@ BookmarkBubbleGtk* g_bubble = NULL; // Max number of most recently used folders. const size_t kMaxMRUFolders = 5; +// Padding between content and edge of info bubble. +const int kContentBorder = 7; + std::vector<const BookmarkNode*> PopulateFolderCombo(BookmarkModel* model, const GURL& url, GtkWidget* folder_combo) { @@ -171,6 +174,7 @@ BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWindow* toplevel_window, // portion with the name entry and the folder combo. |bottom| is the final // row with a spacer, and the edit... and close buttons on the right. GtkWidget* content = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(content), kContentBorder); GtkWidget* top = gtk_hbox_new(FALSE, 0); gtk_misc_set_alignment(GTK_MISC(label), 0, 1); diff --git a/chrome/browser/gtk/content_blocked_bubble_gtk.cc b/chrome/browser/gtk/content_blocked_bubble_gtk.cc index 630eb59..bbeda7f 100644 --- a/chrome/browser/gtk/content_blocked_bubble_gtk.cc +++ b/chrome/browser/gtk/content_blocked_bubble_gtk.cc @@ -20,6 +20,9 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" +// Padding between content and edge of info bubble. +static const int kContentBorder = 7; + ContentBlockedBubbleGtk::ContentBlockedBubbleGtk( GtkWindow* toplevel_window, const gfx::Rect& bounds, @@ -71,6 +74,7 @@ void ContentBlockedBubbleGtk::BuildBubble() { GtkThemeProvider* theme_provider = GtkThemeProvider::GetFrom(profile_); GtkWidget* bubble_content = gtk_vbox_new(FALSE, gtk_util::kControlSpacing); + gtk_container_set_border_width(GTK_CONTAINER(bubble_content), kContentBorder); // Add the content label. static const int kTitleIDs[CONTENT_SETTINGS_NUM_TYPES] = { diff --git a/chrome/browser/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/gtk/extension_installed_bubble_gtk.cc index 25b876e..e0becb4 100644 --- a/chrome/browser/gtk/extension_installed_bubble_gtk.cc +++ b/chrome/browser/gtk/extension_installed_bubble_gtk.cc @@ -29,7 +29,10 @@ const int kIconSize = 43; const int kTextColumnVerticalSpacing = 7; const int kTextColumnWidth = 350; -} +// Padding between content and edge of info bubble. +const int kContentBorder = 7; + +} // namespace void ExtensionInstalledBubbleGtk::Show(Extension *extension, Browser *browser, SkBitmap icon) { @@ -116,6 +119,7 @@ void ExtensionInstalledBubbleGtk::ShowInternal() { // Setup the InfoBubble content. GtkWidget* bubble_content = gtk_hbox_new(FALSE, kHorizontalColumnSpacing); + gtk_container_set_border_width(GTK_CONTAINER(bubble_content), kContentBorder); // Scale icon down to 43x43, but allow smaller icons (don't scale up). GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&icon_); diff --git a/chrome/browser/gtk/first_run_bubble.cc b/chrome/browser/gtk/first_run_bubble.cc index 96cf7411..86d7d88 100644 --- a/chrome/browser/gtk/first_run_bubble.cc +++ b/chrome/browser/gtk/first_run_bubble.cc @@ -24,6 +24,9 @@ const char kSearchLabelMarkup[] = "<big><b>%s</b></big>"; // Padding for the buttons on first run bubble. const int kButtonPadding = 4; +// Padding between content and edge of info bubble. +const int kContentBorder = 7; + string16 GetDefaultSearchEngineName(Profile* profile) { if (!profile) { NOTREACHED(); @@ -108,6 +111,7 @@ FirstRunBubble::FirstRunBubble(Profile* profile, l10n_util::GetStringUTF8(IDS_FR_BUBBLE_CHANGE).c_str()); content_ = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(content_), kContentBorder); // We compute the widget's size using the parent window -- |content_| is // unrealized at this point. diff --git a/chrome/browser/gtk/info_bubble_gtk.cc b/chrome/browser/gtk/info_bubble_gtk.cc index 8e7ae22..fdac85a 100644 --- a/chrome/browser/gtk/info_bubble_gtk.cc +++ b/chrome/browser/gtk/info_bubble_gtk.cc @@ -33,10 +33,10 @@ const int kArrowToContentPadding = -6; const int kCornerSize = 3; // Margins around the content. -const int kTopMargin = kArrowSize + kCornerSize + 6; -const int kBottomMargin = kCornerSize + 6; -const int kLeftMargin = kCornerSize + 6; -const int kRightMargin = kCornerSize + 6; +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); |