[gtk] fix line wrap issue on app shortcut dialog

chrome/browser/gtk/create_application_shortcuts_dialog_gtk.cc

 // Copyright (c) 2010 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/create_application_shortcuts_dialog_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/environment.h"
@@ skipping 69 matching lines @@
 void CreateApplicationShortcutsDialogGtk::CreateDialogBox(GtkWindow* parent) {
   // Build the dialog.
   create_dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_CREATE_SHORTCUTS_TITLE).c_str(),
       parent,
       (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
       GTK_STOCK_CANCEL,
       GTK_RESPONSE_REJECT,
       NULL);
   gtk_widget_realize(create_dialog_);
-  gtk_util::SetWindowSizeFromResources(GTK_WINDOW(create_dialog_),
-                                       IDS_CREATE_SHORTCUTS_DIALOG_WIDTH_CHARS,
-                                       -1,  // height
-                                       false);  // resizable
+  gtk_window_set_resizable(GTK_WINDOW(create_dialog_), false);
   gtk_util::AddButtonToDialog(create_dialog_,
       l10n_util::GetStringUTF8(IDS_CREATE_SHORTCUTS_COMMIT).c_str(),
       GTK_STOCK_APPLY, GTK_RESPONSE_ACCEPT);
 
   GtkWidget* content_area = GTK_DIALOG(create_dialog_)->vbox;
   gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing);
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_add(GTK_CONTAINER(content_area), vbox);
 
   // Create a box containing basic information about the new shortcut: an image
   // on the left, and a description on the right.
   GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
   gtk_container_set_border_width(GTK_CONTAINER(hbox),
                                  gtk_util::kControlSpacing);
 
   // Put the icon preview in place.
   GtkWidget* favicon_image = gtk_image_new_from_pixbuf(favicon_pixbuf_);
   gtk_box_pack_start(GTK_BOX(hbox), favicon_image, FALSE, FALSE, 0);
 
   // Create the label with application shortcut description.
   GtkWidget* description_label = gtk_label_new(NULL);
   gtk_box_pack_start(GTK_BOX(hbox), description_label, FALSE, FALSE, 0);
   gtk_label_set_line_wrap(GTK_LABEL(description_label), TRUE);
   gtk_widget_realize(description_label);
-  int label_height;
-  gtk_util::GetWidgetSizeFromCharacters(description_label, -1,
-                                        kDescriptionLabelHeightLines, NULL,
-                                        &label_height);
-  gtk_widget_set_size_request(description_label, -1, label_height);
+
+  // Set the size request on the label so it knows where to line wrap. The width
+  // is the desired size of the dialog less the space reserved for padding and
+  // the image.
+  int label_width, label_height;
+  gtk_util::GetWidgetSizeFromResources(
+      description_label,
+      IDS_CREATE_SHORTCUTS_DIALOG_WIDTH_CHARS, -1, &label_width, NULL);
+  label_width -= gtk_util::kControlSpacing * 3 +
+      gdk_pixbuf_get_width(favicon_pixbuf_);
+  gtk_util::GetWidgetSizeFromCharacters(
+      description_label, -1, kDescriptionLabelHeightLines, NULL, &label_height);
+  gtk_widget_set_size_request(description_label, label_width, label_height);
   gtk_misc_set_alignment(GTK_MISC(description_label), 0, 0.5);
   std::string description(UTF16ToUTF8(shortcut_info_.description));
   std::string title(UTF16ToUTF8(shortcut_info_.title));
   gtk_label_set_text(GTK_LABEL(description_label),
                      (description.empty() ? title : description).c_str());
 
   // Label on top of the checkboxes.
   GtkWidget* checkboxes_label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_CREATE_SHORTCUTS_LABEL).c_str());
   gtk_misc_set_alignment(GTK_MISC(checkboxes_label), 0, 0);
@@ skipping 181 matching lines @@
     SkBitmap* image, ExtensionResource resource, int index) {
   if (image->isNull()) {
     NOTREACHED() << "Corrupt image in profile?";
     return;
   }
   shortcut_info_.favicon = *image;
 
   CreateIconPixBuf(*image);
   CreateDialogBox(parent_);
 }