linux: unify all the dialog layout code for visual consistency.

chrome/browser/gtk/about_chrome_dialog.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/about_chrome_dialog.h"
 
 #include <gtk/gtk.h>
 #include <wchar.h>
 
 #include "app/l10n_util.h"
@@ skipping 78 matching lines @@
   current_version += L")";
 #endif
 
   // Build the dialog.
   GtkWidget* dialog = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_ABOUT_CHROME_TITLE).c_str(),
       parent,
       GTK_DIALOG_MODAL,
       GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
       NULL);
+  // Pick up the style set in gtk_util.cc:InitRCStyles().
+  // The layout of this dialog is special because the logo should be flush
+  // with the edges of the window.
+  gtk_widget_set_name(dialog, "about-dialog");
+  gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 
   GtkWidget* content_area = GTK_DIALOG(dialog)->vbox;
 
   // Use an event box to get the background painting correctly
   GtkWidget* ebox = gtk_event_box_new();
   gtk_widget_modify_bg(ebox, GTK_STATE_NORMAL, &gfx::kGdkWhite);
 
   GtkWidget* hbox = gtk_hbox_new(FALSE, 0);
 
   GtkWidget* text_alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
@@ skipping 19 matching lines @@
 
   GtkWidget* image_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_end(GTK_BOX(image_vbox),
                    gtk_image_new_from_pixbuf(background),
                    FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(hbox), image_vbox, FALSE, FALSE, 0);
   gtk_container_add(GTK_CONTAINER(ebox), hbox);
   gtk_box_pack_start(GTK_BOX(content_area), ebox, TRUE, TRUE, 0);
 
+  // We use a separate box for the licensing etc. text.  See the comment near
+  // the top of this function about using a special layout for this dialog.
+  GtkWidget* vbox = gtk_vbox_new(FALSE, 6);
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
+
   GtkWidget* copyright_label = MakeMarkupLabel(
       "<span size=\"smaller\">%s</span>",
       l10n_util::GetString(IDS_ABOUT_VERSION_COPYRIGHT));
-  gtk_box_pack_start(GTK_BOX(content_area), copyright_label, TRUE, TRUE, 5);
+  gtk_box_pack_start(GTK_BOX(vbox), copyright_label, TRUE, TRUE, 5);
 
   // TODO(erg): Figure out how to really insert links. We could just depend on
   // (or include the source of) libsexy's SexyUrlLabel gtk widget...
   std::wstring license = l10n_util::GetString(IDS_ABOUT_VERSION_LICENSE);
   RemoveText(&license, kBeginLinkChr);
   RemoveText(&license, kBeginLinkOss);
   RemoveText(&license, kBeginLink);
   RemoveText(&license, kEndLinkChr);
   RemoveText(&license, kEndLinkOss);
   RemoveText(&license, kEndLink);
 
   GtkWidget* license_label = MakeMarkupLabel(
       "<span size=\"smaller\">%s</span>", license);
 
   gtk_label_set_line_wrap(GTK_LABEL(license_label), TRUE);
   gtk_misc_set_alignment(GTK_MISC(license_label), 0, 0);
-  gtk_box_pack_start(GTK_BOX(content_area), license_label, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), license_label, TRUE, TRUE, 0);
 
   // Hack around Gtk's not-so-good label wrapping, as described here:
   // http://blog.16software.com/dynamic-label-wrapping-in-gtk
   g_signal_connect(G_OBJECT(license_label), "size-allocate",
                    G_CALLBACK(FixLabelWrappingCallback), NULL);
 
+  gtk_box_pack_start(GTK_BOX(content_area), vbox, TRUE, TRUE, 0);
+
   g_signal_connect(dialog, "response", G_CALLBACK(OnDialogResponse), NULL);
   gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
   gtk_widget_show_all(dialog);
 }