Review Request: fix issue 6223 -- issues on drag/drop tab

chrome/browser/views/tabs/dragged_tab_controller.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/tabs/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "app/animation.h"
 #include "app/gfx/canvas.h"
+#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/dragged_tab_view.h"
 #include "chrome/browser/views/tabs/native_view_photobooth.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
@@ skipping 41 matching lines @@
     paint.setColor(SkColorSetRGB(108, 108, 108));
     paint.setStyle(SkPaint::kFill_Style);
     canvas->drawRoundRect(outer_rect, SkIntToScalar(kRoundedRectRadius),
                           SkIntToScalar(kRoundedRectRadius), paint);
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
     SkBitmap* high_icon = rb.GetBitmapNamed(IDR_DOCK_HIGH);
     SkBitmap* wide_icon = rb.GetBitmapNamed(IDR_DOCK_WIDE);
 
+    bool rtl_ui = l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT;
+    if (rtl_ui) {
+      // Flip canvas to draw the mirrored tab images for RTL UI.
+      canvas->save();
+      canvas->TranslateInt(width(), 0);
+      canvas->ScaleInt(-1, 1);
+    }
+    int x_of_active_tab = -1;
+    int x_of_inactive_tab = -1;
     switch (type_) {
       case DockInfo::LEFT_OF_WINDOW:
       case DockInfo::LEFT_HALF:
-        canvas->DrawBitmapInt(*high_icon,
-            width() / 2 - high_icon->width() - kTabSpacing / 2,
-            (height() - high_icon->height()) / 2);
+        if (!rtl_ui) {
+          x_of_active_tab = width() / 2 - high_icon->width() - kTabSpacing / 2;
+          x_of_inactive_tab = width() / 2 + kTabSpacing / 2;
+        } else {
+          // Adjust x axis for RTL UI after flippping canvas.
+          x_of_active_tab = width() / 2 + kTabSpacing / 2;
+          x_of_inactive_tab = width() / 2 - high_icon->width() -
+                              kTabSpacing / 2;
+        }
+        canvas->DrawBitmapInt(*high_icon, x_of_active_tab,
+                              (height() - high_icon->height()) / 2);
         if (type_ == DockInfo::LEFT_OF_WINDOW) {
-          DrawBitmapWithAlpha(canvas, *high_icon, width() / 2 + kTabSpacing / 2,
+          DrawBitmapWithAlpha(canvas, *high_icon, x_of_inactive_tab,
                               (height() - high_icon->height()) / 2);
         }
         break;
 
 
       case DockInfo::RIGHT_OF_WINDOW:
       case DockInfo::RIGHT_HALF:
-        canvas->DrawBitmapInt(*high_icon, width() / 2 + kTabSpacing / 2,
+        if (!rtl_ui) {
+          x_of_active_tab = width() / 2 + kTabSpacing / 2;
+          x_of_inactive_tab = width() / 2 - high_icon->width() -
+                              kTabSpacing / 2;
+        } else {
+          // Adjust x axis for RTL UI after flippping canvas.
+          x_of_active_tab = width() / 2 - high_icon->width() - kTabSpacing / 2;
+          x_of_inactive_tab = width() / 2 + kTabSpacing / 2;
+        }
+        canvas->DrawBitmapInt(*high_icon, x_of_active_tab,
                               (height() - high_icon->height()) / 2);
         if (type_ == DockInfo::RIGHT_OF_WINDOW) {
-         DrawBitmapWithAlpha(canvas, *high_icon,
-              width() / 2 - high_icon->width() - kTabSpacing / 2,
-              (height() - high_icon->height()) / 2);
+         DrawBitmapWithAlpha(canvas, *high_icon, x_of_inactive_tab,
+                             (height() - high_icon->height()) / 2);
         }
         break;
 
       case DockInfo::TOP_OF_WINDOW:
         canvas->DrawBitmapInt(*wide_icon, (width() - wide_icon->width()) / 2,
                               height() / 2 - high_icon->height());
         break;
 
       case DockInfo::MAXIMIZE: {
         SkBitmap* max_icon = rb.GetBitmapNamed(IDR_DOCK_MAX);
@@ skipping 10 matching lines @@
           DrawBitmapWithAlpha(canvas, *wide_icon,
               (width() - wide_icon->width()) / 2,
               height() / 2 - kTabSpacing / 2 - wide_icon->height());
         }
         break;
 
       default:
         NOTREACHED();
         break;
     }
+    if (rtl_ui)
+      canvas->restore();
   }
 
  private:
   void DrawBitmapWithAlpha(gfx::Canvas* canvas, const SkBitmap& image,
                            int x, int y) {
     SkPaint paint;
     paint.setAlpha(128);
     canvas->DrawBitmapInt(image, x, y, paint);
   }
 
@@ skipping 160 matching lines @@
   // contents to NULL, otherwise if the view is animating to its destination
   // bounds, it won't be able to clean up properly since its cleanup routine
   // uses GetIndexForDraggedContents, which will be invalid.
   view_.reset(NULL);
   SetDraggedContents(NULL); // This removes our observer.
 }
 
 void DraggedTabController::CaptureDragInfo(const gfx::Point& mouse_offset) {
   start_screen_point_ = GetCursorScreenPoint();
   mouse_offset_ = mouse_offset;
+  InitWindowCreatePoint();
 }
 
 void DraggedTabController::Drag() {
   bring_to_front_timer_.Stop();
 
   // Before we get to dragging anywhere, ensure that we consider ourselves
   // attached to the source tabstrip.
   if (source_tab_->IsVisible() && CanStartDrag())
     Attach(source_tabstrip_, gfx::Point());
 
@@ skipping 140 matching lines @@
 void DraggedTabController::DidProcessEvent(GdkEvent* event) {
   NOTIMPLEMENTED();
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // DraggedTabController, private:
 
 void DraggedTabController::InitWindowCreatePoint() {
   window_create_point_.SetPoint(mouse_offset_.x(), mouse_offset_.y());
-  Tab* first_tab = attached_tabstrip_->GetTabAt(0);
+  // window_create_point_ is only used in CompleteDrag() (through
+  // GetWindowCreatePoint() to get the start point of the docked window) when
+  // the attached_tabstrip_ is NULL and all the window's related bound
+  // information are obtained from source_tabstrip_. So, we need to get the
+  // first_tab based on source_tabstrip_, not attached_tabstrip_. Otherwise,
+  // the window_create_point_ is not in the correct coordinate system. Please
+  // refer to http://crbug.com/6223 comment #15 for detailed information.
+  Tab* first_tab = source_tabstrip_->GetTabAt(0);
   views::View::ConvertPointToWidget(first_tab, &window_create_point_);
 }
 
 gfx::Point DraggedTabController::GetWindowCreatePoint() const {
   gfx::Point cursor_point = GetCursorScreenPoint();
   if (dock_info_.type() != DockInfo::NONE) {
     // If we're going to dock, we need to return the exact coordinate,
     // otherwise we may attempt to maximize on the wrong monitor.
     return cursor_point;
   }
@@ skipping 206 matching lines @@
         screen_point.y() <= upper_threshold) {
       return tabstrip;
     }
   }
   return NULL;
 }
 
 void DraggedTabController::Attach(TabStrip* attached_tabstrip,
                                   const gfx::Point& screen_point) {
   attached_tabstrip_ = attached_tabstrip;
-  InitWindowCreatePoint();
   attached_tabstrip_->GenerateIdealBounds();
 
   // We don't need the photo-booth while we're attached.
   photobooth_.reset(NULL);
 
   Tab* tab = GetTabMatchingDraggedContents(attached_tabstrip_);
 
   // Update the View first, so we can ask it for its bounds and determine
   // where to insert the hidden Tab.
 
@@ skipping 342 matching lines @@
         default:
           NOTREACHED();
           break;
       }
     }
     // Compel the model to construct a new window for the detached TabContents.
     gfx::Rect browser_rect = source_tabstrip_->GetWindow()->GetBounds();
     gfx::Rect window_bounds(
         GetWindowCreatePoint(),
         gfx::Size(browser_rect.width(), browser_rect.height()));
+    // When modifying the following if statement, please make sure not to
+    // introduce issue listed in http://crbug.com/6223 comment #11.
+    bool rtl_ui = (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT);
+    bool has_dock_position = (dock_info_.type() != DockInfo::NONE);
+    if (rtl_ui && has_dock_position) {
+      // Mirror X axis so the docked tab is aligned using the mouse click as
+      // the top-right corner.
+      window_bounds.set_x(window_bounds.x() - window_bounds.width());
+    }
     Browser* new_browser =
         source_tabstrip_->model()->delegate()->CreateNewStripWithContents(
             dragged_contents_, window_bounds, dock_info_);
     new_browser->window()->Show();
     CleanUpHiddenFrame();
   }
 
   return destroy_immediately;
 }
 
@@ skipping 125 matching lines @@
 
     // The previous call made the window appear on top of the dragged window,
     // move the dragged window to the front.
     SetWindowPos(view_->GetWidget()->GetNativeView(), HWND_TOP, 0, 0, 0, 0,
                  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
 #else
     NOTIMPLEMENTED();
 #endif
   }
 }