Fix appearance of dangerous download dialog....

chrome/browser/gtk/download_item_gtk.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/download_item_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/text_elider.h"
@@ skipping 283 matching lines @@
         UTF8ToUTF16(get_download()->original_name().value()));
     gchar* label_markup =
         g_markup_printf_escaped(kLabelColorMarkup, kFilenameColor,
                                 dangerous_warning.c_str());
     GtkWidget* dangerous_label = gtk_label_new(NULL);
     // Until we switch to vector graphics, force the font size.
     // 13.4px == 10pt @ 96dpi
     gtk_util::ForceFontSizePixels(dangerous_label, 13.4);
     gtk_label_set_markup(GTK_LABEL(dangerous_label), label_markup);
     gtk_label_set_line_wrap(GTK_LABEL(dangerous_label), TRUE);
+    // We pass TRUE, TRUE so that the label will condense to less than its
+    // request when the animation is going on.
     gtk_box_pack_start(GTK_BOX(dangerous_hbox_), dangerous_label,
-                       FALSE, FALSE, 0);
+                       TRUE, TRUE, 0);
     g_free(label_markup);
 
     // Create the ok button.
     GtkWidget* dangerous_accept = gtk_button_new_with_label(
         l10n_util::GetStringUTF8(IDS_SAVE_DOWNLOAD).c_str());
     g_signal_connect(dangerous_accept, "clicked",
                      G_CALLBACK(OnDangerousAccept), this);
     gtk_util::CenterWidgetInHBox(dangerous_hbox_, dangerous_accept, false, 0);
 
     // Create the nevermind button.
     GtkWidget* dangerous_decline = gtk_button_new_with_label(
         l10n_util::GetStringUTF8(IDS_DISCARD_DOWNLOAD).c_str());
     g_signal_connect(dangerous_decline, "clicked",
                      G_CALLBACK(OnDangerousDecline), this);
     gtk_util::CenterWidgetInHBox(dangerous_hbox_, dangerous_decline, false, 0);
 
     // Put it in an alignment so that padding will be added on the left and
-    // right, and an event box so that drawing will be clipped correctly.
-    dangerous_prompt_ = gtk_util::CreateGtkBorderBin(dangerous_hbox_, NULL,
+    // right.
+    dangerous_prompt_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
+    gtk_alignment_set_padding(GTK_ALIGNMENT(dangerous_prompt_),
         0, 0, kDangerousElementPadding, kDangerousElementPadding);
+    gtk_container_add(GTK_CONTAINER(dangerous_prompt_), dangerous_hbox_);
     gtk_box_pack_start(GTK_BOX(hbox_), dangerous_prompt_, FALSE, FALSE, 0);
     gtk_widget_set_app_paintable(dangerous_prompt_, TRUE);
     g_signal_connect(dangerous_prompt_, "expose-event",
                      G_CALLBACK(OnDangerousPromptExpose), this);
     gtk_widget_show_all(dangerous_prompt_);
 
-    // The full width will depend on the text.
+    // The width will depend on the text.
     GtkRequisition req;
     gtk_widget_size_request(dangerous_hbox_, &req);
     dangerous_hbox_full_width_ = req.width;
+    gtk_widget_size_request(dangerous_label, &req);
+    dangerous_hbox_start_width_ = dangerous_hbox_full_width_ - req.width;
   }
 
   new_item_animation_->Show();
 }
 
 DownloadItemGtk::~DownloadItemGtk() {
   StopDownloadProgress();
   g_signal_handler_disconnect(parent_shelf_->GetHBox(), resize_handler_id_);
   gtk_widget_destroy(hbox_);
   get_download()->RemoveObserver(this);
@@ skipping 51 matching lines @@
                               WideToUTF8(status_text).c_str());
   gtk_label_set_markup(GTK_LABEL(status_label_), label_markup);
   g_free(label_markup);
 }
 
 void DownloadItemGtk::AnimationProgressed(const Animation* animation) {
   if (animation == complete_animation_.get()) {
     gtk_widget_queue_draw(progress_area_);
   } else {
     if (IsDangerous()) {
-      int showing_width = std::max(kMinDangerousDownloadWidth,
-          static_cast<int>(dangerous_hbox_full_width_ *
-                           new_item_animation_->GetCurrentValue()));
+      int progress = (dangerous_hbox_full_width_ -
+                     dangerous_hbox_start_width_) *
+                     new_item_animation_->GetCurrentValue();
+      int showing_width = dangerous_hbox_start_width_ + progress;
+      showing_width = std::max(kMinDangerousDownloadWidth, showing_width);
       gtk_widget_set_size_request(dangerous_hbox_, showing_width, -1);
     } else {
       DCHECK(animation == new_item_animation_.get());
       // See above TODO for explanation of the extra 50.
       int showing_width = std::max(kMinDownloadItemWidth,
           static_cast<int>((kTextWidth + 50 +
                            download_util::kSmallProgressIconSize) *
                            new_item_animation_->GetCurrentValue()));
       showing_width = std::max(showing_width, kMinDownloadItemWidth);
       gtk_widget_set_size_request(body_, showing_width, -1);
@@ skipping 235 matching lines @@
       item->get_download());
 }
 
 // static
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button,
                                          DownloadItemGtk* item) {
   if (item->get_download()->state() == DownloadItem::IN_PROGRESS)
     item->get_download()->Cancel(true);
   item->get_download()->Remove(true);
 }