Review request - fix issue 6103 and 13217 -- mirror download item in download shelf

chrome/browser/views/download_item_view.cc

 // Copyright (c) 2006-2008 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/views/download_item_view.h"
 
 #include <vector>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
@@ skipping 134 matching lines @@
     dragging_(false),
     starting_drag_(false),
     model_(model),
     save_button_(NULL),
     discard_button_(NULL),
     dangerous_download_label_(NULL),
     dangerous_download_label_sized_(false),
     disabled_while_opening_(false),
     creation_time_(base::Time::Now()),
     ALLOW_THIS_IN_INITIALIZER_LIST(reenable_method_factory_(this)) {
-  // TODO(idana) Bug# 1163334
-  //
-  // We currently do not mirror each download item on the download shelf (even
-  // though the download shelf itself is mirrored and the items appear from
-  // right to left on RTL UIs).
-  //
-  // We explicitly disable mirroring for the item because the code that draws
-  // the download progress animation relies on the View's UI layout setting
-  // when positioning the animation so we should make sure that code doesn't
-  // treat our View as a mirrored View.
-  EnableUIMirroringForRTLLanguages(false);
   DCHECK(download_);
   download_->AddObserver(this);
 
   ResourceBundle &rb = ResourceBundle::GetSharedInstance();
 
   BodyImageSet normal_body_image_set = {
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_LEFT_TOP),
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE),
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM),
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_CENTER_TOP),
@@ skipping 302 matching lines @@
                      (drop_down_image_set ?
                         normal_drop_down_image_set_.center->width() :
                         0);
 
   // May be caused by animation.
   if (center_width <= 0)
     return;
 
   // Paint the background images.
   int x = kLeftPadding;
+  bool rtl_ui = UILayoutIsRightToLeft();
+  if (rtl_ui) {
+    // Since we do not have the mirrored images for
+    // (hot_)body_image_set->top_left, (hot_)body_image_set->left,
+    // (hot_)body_image_set->bottom_left, and drop_down_image_set,
+    // for RTL UI, we flip the canvas to draw those images mirrored.
+    // Consequently, we do not need to mirror the x-axis of those images.
+    canvas->save();
+    canvas->TranslateInt(width(), 0);
+    canvas->ScaleInt(-1, 1);
+  }
   PaintBitmaps(canvas,
                body_image_set->top_left, body_image_set->left,
                body_image_set->bottom_left,
                x, box_y_, box_height_, body_image_set->top_left->width());
   x += body_image_set->top_left->width();
   PaintBitmaps(canvas,
                body_image_set->top, body_image_set->center,
                body_image_set->bottom,
                x, box_y_, box_height_, center_width);
   x += center_width;
@@ skipping 19 matching lines @@
                  hot_body_image_set_.top, hot_body_image_set_.center,
                  hot_body_image_set_.bottom,
                  x, box_y_, box_height_, center_width);
     x += center_width;
     PaintBitmaps(canvas,
                  hot_body_image_set_.top_right, hot_body_image_set_.right,
                  hot_body_image_set_.bottom_right,
                  x, box_y_, box_height_,
                  hot_body_image_set_.top_right->width());
     canvas->restore();
+    if (rtl_ui) {
+      canvas->restore();
+      canvas->save();
+      // Flip it for drawing drop-down images for RTL locales.
+      canvas->TranslateInt(width(), 0);
+      canvas->ScaleInt(-1, 1);
+    }
   }
 
   x += body_image_set->top_right->width();
 
   // Paint the drop-down.
   if (drop_down_image_set) {
     PaintBitmaps(canvas,
                  drop_down_image_set->top, drop_down_image_set->center,
                  drop_down_image_set->bottom,
                  x, box_y_, box_height_, drop_down_image_set->top->width());
 
     // Overlay our drop-down hot state.
     if (drop_hover_animation_->GetCurrentValue() > 0) {
       canvas->saveLayerAlpha(NULL,
           static_cast<int>(drop_hover_animation_->GetCurrentValue() * 255),
           SkCanvas::kARGB_NoClipLayer_SaveFlag);
       canvas->drawARGB(0, 255, 255, 255, SkPorterDuff::kClear_Mode);
 
       PaintBitmaps(canvas,
                    drop_down_image_set->top, drop_down_image_set->center,
                    drop_down_image_set->bottom,
                    x, box_y_, box_height_, drop_down_image_set->top->width());
 
       canvas->restore();
     }
   }
 
+  if (rtl_ui) {
+    // Restore the canvas to avoid file name etc. text are drawn flipped.
+    // Consequently, the x-axis of following canvas->DrawXXX() method should be
+    // mirrored so the text and images are down in the right positions.
+    canvas->restore();
+  }
+
   // Print the text, left aligned and always print the file extension.
   // Last value of x was the end of the right image, just before the button.
   // Note that in dangerous mode we use a label (as the text is multi-line).
   if (!IsDangerousMode()) {
     std::wstring filename;
     if (!disabled_while_opening_) {
       filename = gfx::ElideFilename(download_->GetFileName(),
                                     font_, kTextWidth);
     } else {
       std::wstring tmp_name =
           l10n_util::GetStringF(IDS_DOWNLOAD_STATUS_OPENING,
                                 download_->GetFileName().ToWStringHack());
 #if defined(OS_WIN)
       FilePath filepath(tmp_name);
 #else
       FilePath filepath(base::SysWideToNativeMB(tmp_name));
 #endif
       filename = gfx::ElideFilename(filepath, font_, kTextWidth);
     }
 
+    int mirrored_x = MirroredXWithWidthInsideView(
+        download_util::kSmallProgressIconSize, kTextWidth);
     if (show_status_text_) {
       int y = box_y_ + kVerticalPadding;
 
       // Draw the file's name.
       canvas->DrawStringInt(filename, font_,
                             IsEnabled() ? kFileNameColor :
                                           kFileNameDisabledColor,
-                            download_util::kSmallProgressIconSize, y,
-                            kTextWidth, font_.height());
+                            mirrored_x, y, kTextWidth, font_.height());
 
       y += font_.height() + kVerticalTextPadding;
 
-      canvas->DrawStringInt(status_text_, font_, kStatusColor,
-                            download_util::kSmallProgressIconSize, y,
+      canvas->DrawStringInt(status_text_, font_, kStatusColor, mirrored_x, y,
                             kTextWidth, font_.height());
     } else {
       int y = box_y_ + (box_height_ - font_.height()) / 2;
 
       // Draw the file's name.
       canvas->DrawStringInt(filename, font_,
                             IsEnabled() ? kFileNameColor :
                                           kFileNameDisabledColor,
-                            download_util::kSmallProgressIconSize, y,
-                            kTextWidth, font_.height());
+                            mirrored_x, y, kTextWidth, font_.height());
     }
   }
 
   // Paint the icon.
   IconManager* im = g_browser_process->icon_manager();
   SkBitmap* icon = IsDangerousMode() ? warning_icon_ :
       im->LookupIcon(download_->full_path(), IconLoader::SMALL);
 
   // We count on the fact that the icon manager will cache the icons and if one
   // is available, it will be cached here. We *don't* want to request the icon
@@ skipping 10 matching lines @@
       } else if (download_->state() == DownloadItem::COMPLETE &&
                  complete_animation_.get() &&
                  complete_animation_->IsAnimating()) {
         download_util::PaintDownloadComplete(canvas, this, 0, 0,
             complete_animation_->GetCurrentValue(),
             download_util::SMALL);
       }
     }
 
     // Draw the icon image.
+    int mirrored_x = MirroredXWithWidthInsideView(
+        download_util::kSmallProgressIconOffset, icon->width());
     if (IsEnabled()) {
-      canvas->DrawBitmapInt(*icon,
-                            download_util::kSmallProgressIconOffset,
+      canvas->DrawBitmapInt(*icon, mirrored_x,
                             download_util::kSmallProgressIconOffset);
     } else {
       // Use an alpha to make the image look disabled.
       SkPaint paint;
       paint.setAlpha(120);
-      canvas->DrawBitmapInt(*icon,
-                            download_util::kSmallProgressIconOffset,
-                            download_util::kSmallProgressIconOffset,
-                            paint);
+      canvas->DrawBitmapInt(*icon, mirrored_x,
+                            download_util::kSmallProgressIconOffset, paint);
     }
   }
 }
 
 void DownloadItemView::PaintBitmaps(gfx::Canvas* canvas,
                                     const SkBitmap* top_bitmap,
                                     const SkBitmap* center_bitmap,
                                     const SkBitmap* bottom_bitmap,
                                     int x, int y, int height, int width) {
   int middle_height = height - top_bitmap->height() - bottom_bitmap->height();
@@ skipping 114 matching lines @@
     // appears to cause RootView to get a mouse pressed BEFORE the mouse
     // release is seen, which means RootView sends us another mouse press no
     // matter where the user pressed. To force RootView to recalculate the
     // mouse target during the mouse press we explicitly set the mouse handler
     // to NULL.
     GetRootView()->SetMouseHandler(NULL);
 
     // The menu's position is different depending on the UI layout.
     // DownloadShelfContextMenu will take care of setting the right anchor for
     // the menu depending on the locale.
-    //
-    // TODO(idana): when bug# 1163334 is fixed the following check should be
-    // replaced with UILayoutIsRightToLeft().
     point.set_y(height());
-    if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) {
+    if (UILayoutIsRightToLeft()) {
       point.set_x(width());
     } else {
       point.set_x(drop_down_x_);
     }
 
     views::View::ConvertPointToScreen(this, &point);
     DownloadShelfContextMenuWin menu(model_.get(),
                                      GetWidget()->GetNativeView(),
                                      point);
     drop_down_pressed_ = false;
@@ skipping 159 matching lines @@
     size = dangerous_download_label_->GetPreferredSize();
 
   dangerous_download_label_->SetBounds(0, 0, size.width(), size.height());
   dangerous_download_label_sized_ = true;
 }
 
 void DownloadItemView::Reenable() {
   disabled_while_opening_ = false;
   SetEnabled(true);  // Triggers a repaint.
 }