summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/options/content_page_gtk.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 16:01:18 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 16:01:18 +0000
commit85da56ff2ecbb7806a1de8edcc2c76a9461b378d (patch)
tree455d2439603018d23a7c0fcf07e402df766e2232 /chrome/browser/gtk/options/content_page_gtk.cc
parentbcf91677b8549061a9d2cf089dc1612d5de797c7 (diff)
downloadchromium_src-85da56ff2ecbb7806a1de8edcc2c76a9461b378d.zip
chromium_src-85da56ff2ecbb7806a1de8edcc2c76a9461b378d.tar.gz
chromium_src-85da56ff2ecbb7806a1de8edcc2c76a9461b378d.tar.bz2
[GTK] Apply SetLabelWidth workaround in more places.
- first run search engine ballot explanatory text - first run bubble text - sync setup label in options dialog's second tab BUG=54898 TEST=all places listed above look good in LTR and at least ok in RTL Review URL: http://codereview.chromium.org/3443006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options/content_page_gtk.cc')
-rw-r--r--chrome/browser/gtk/options/content_page_gtk.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index a9b09d5..8aff196 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -44,7 +44,7 @@ static const GdkColor kSyncLabelErrorBgColor = GDK_COLOR_RGB(0xff, 0x9a, 0x9a);
// Helper for WrapLabelAtAllocationHack.
void OnLabelAllocate(GtkWidget* label, GtkAllocation* allocation) {
- gtk_widget_set_size_request(label, allocation->width, -1);
+ gtk_util::SetLabelWidth(label, allocation->width);
// Disconnect ourselves. Repeatedly resizing based on allocation causes
// the dialog to become unshrinkable.
@@ -337,8 +337,7 @@ GtkWidget* ContentPageGtk::InitSyncGroup() {
sync_status_label_ = gtk_label_new("");
WrapLabelAtAllocationHack(sync_status_label_);
- gtk_label_set_line_wrap(GTK_LABEL(sync_status_label_), TRUE);
- gtk_misc_set_alignment(GTK_MISC(sync_status_label_), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(sync_status_label_), 0, 0.5);
gtk_box_pack_start(GTK_BOX(vbox), sync_status_label_background_, FALSE,
FALSE, 0);
gtk_container_add(GTK_CONTAINER(sync_status_label_background_),