summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-16 00:31:12 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-16 00:31:12 +0000
commit58b2d765ad6feb60fb2ba9f26b62314d5b5f2f3b (patch)
tree49f5454543d2b998de9d33cac8d1476d91c80fda
parenta0677ea002fc5d27c42e43d4331dbc7f99ee6a88 (diff)
downloadchromium_src-58b2d765ad6feb60fb2ba9f26b62314d5b5f2f3b.zip
chromium_src-58b2d765ad6feb60fb2ba9f26b62314d5b5f2f3b.tar.gz
chromium_src-58b2d765ad6feb60fb2ba9f26b62314d5b5f2f3b.tar.bz2
GTK: fix sizing of js alert dialogs.
Determine the size request after showing the dialog for the first time. For one reason or another, the size request before that point doesn't take into account the checkbox label text. BUG=32394 TEST=see bug Review URL: http://codereview.chromium.org/549073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36438 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/app_modal_dialog_gtk.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/app_modal_dialog_gtk.cc b/chrome/browser/app_modal_dialog_gtk.cc
index 1d541bc..a58e3d3 100644
--- a/chrome/browser/app_modal_dialog_gtk.cc
+++ b/chrome/browser/app_modal_dialog_gtk.cc
@@ -174,8 +174,9 @@ void AppModalDialog::CreateAndShowDialog() {
gtk_dialog_set_default_response(GTK_DIALOG(dialog_), GTK_RESPONSE_OK);
g_signal_connect(dialog_, "response", G_CALLBACK(OnDialogResponse), this);
+ gtk_widget_show_all(GTK_WIDGET(GTK_DIALOG(dialog_)));
+
// Suggest a minimum size.
- gtk_widget_realize(dialog_);
gint width;
GtkRequisition req;
gtk_widget_size_request(dialog_, &req);
@@ -183,8 +184,6 @@ void AppModalDialog::CreateAndShowDialog() {
&width, NULL);
if (width > req.width)
gtk_widget_set_size_request(dialog_, width, -1);
-
- gtk_widget_show_all(GTK_WIDGET(GTK_DIALOG(dialog_)));
}
void AppModalDialog::ActivateModalDialog() {