Support for Adaptive Handle Orientation

ui/touch_selection/touch_handle_drawable_aura.cc

 // Copyright 2015 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 "ui/touch_selection/touch_handle_drawable_aura.h"
 
 #include "ui/aura/window.h"
 #include "ui/aura/window_targeter.h"
 #include "ui/aura_extra/image_window_delegate.h"
 #include "ui/base/cursor/cursor.h"
@@ skipping 78 matching lines @@
   if (enabled == enabled_)
     return;
 
   enabled_ = enabled;
   if (IsVisible())
     window_->Show();
   else
     window_->Hide();
 }
 
-void TouchHandleDrawableAura::SetOrientation(
-    TouchHandleOrientation orientation) {
+void TouchHandleDrawableAura::SetOrientation(TouchHandleOrientation orientation,
+                                             bool mirror_vertical,
+                                             bool mirror_horizontal) {
   if (orientation_ == orientation)

[jdduke (slow), 2015/09/14 18:38:41]

Since it's unsupported, can you add

DCHECK(!mirror_vertical);
DCHECK(!mirror_horizontal);

and move the TODO from the header above those 2 lines?

[AviD, 2015/09/21 15:40:16]

Acknowledged.

     return;
   orientation_ = orientation;
   gfx::Image* image = GetHandleImage(orientation);
   window_delegate_->SetImage(*image);
 
   // Calculate the relative bounds.
   gfx::Size image_size = image->Size();
   int window_width = image_size.width() + 2 * kSelectionHandlePadding;
   int window_height = image_size.height() + 2 * kSelectionHandlePadding;
   // Due to the shape of the handle images, the window is aligned differently to
@@ skipping 14 matching lines @@
       break;
   };
   relative_bounds_ = gfx::RectF(
       window_left,
       kSelectionHandleVerticalVisualOffset - kSelectionHandlePadding,
       window_width,
       window_height);
   UpdateBounds();
 }
 
+void TouchHandleDrawableAura::SetOrigin(const gfx::PointF& position) {
+  focal_position_ = position;

[jdduke (slow), 2015/09/14 18:38:41]

Are you sure this is correct?

[mohsen, 2015/09/14 21:52:41]

Now that we set origin instead of focus point, we should get rid of
|relative_bounds_| that was used to calculate origin from focus point. (Though,
kSelectionHandlePadding should still be taken into account)

[AviD, 2015/09/21 15:40:16]

@mohsen:

I have changed SetOrientation to :

void TouchHandleDrawableAura::SetOrientation(TouchHandleOrientation orientation,
                                             bool mirror_vertical,
                                             bool mirror_horizontal) {
  DCHECK(!mirror_vertical);
  DCHECK(!mirror_horizontal);
  if (orientation_ == orientation)
    return;
  orientation_ = orientation;
  gfx::Image* image = GetHandleImage(orientation);
  window_delegate_->SetImage(*image);

  // Calculate the relative bounds.
  gfx::Size image_size = image->Size();
  int window_width = image_size.width() + 2 * kSelectionHandlePadding;
  int window_height = image_size.height() + 2 * kSelectionHandlePadding;
  relative_bounds_ = gfx::RectF(
      -kSelectionHandlePadding,
      kSelectionHandleVerticalVisualOffset - kSelectionHandlePadding,
      window_width,
      window_height);
  UpdateBounds();
}

Would this be fine? Or do you prefer getting rid of relative_bounds_ completely
and make the corresponding calculations in UpdateBounds()?

Additionally, could you guide me to any resource available for enabling touch
handles and testing this for Aura?

[mohsen, 2015/09/21 20:24:22]

Yeah, that seems fine to me.

These handles are enabled on Aura. So, you can try any recent Aura build (i.e.,
Chrome OS, Linux, Windows) to test your changes.

+  UpdateBounds();
+}
+
 void TouchHandleDrawableAura::SetAlpha(float alpha) {
   if (alpha == alpha_)
     return;
 
   alpha_ = alpha;
   window_->layer()->SetOpacity(alpha_);
   if (IsVisible())
     window_->Show();
   else
     window_->Hide();
 }
 
-void TouchHandleDrawableAura::SetFocus(const gfx::PointF& position) {
-  focal_position_ = position;
-  UpdateBounds();
-}
-
 gfx::RectF TouchHandleDrawableAura::GetVisibleBounds() const {
   gfx::RectF bounds(window_->bounds());
   bounds.Inset(kSelectionHandlePadding,
                kSelectionHandlePadding + kSelectionHandleVerticalVisualOffset,
                kSelectionHandlePadding,
                kSelectionHandlePadding);
   return bounds;
 }
 
+const float TouchHandleDrawableAura::GetDrawableHorizontalPaddingRatio() const {
+  // Aura does not have any transparent padding for its handle drawable.
+  return 0.0f;

[jdduke (slow), 2015/09/14 18:38:41]

Is that true?

[mohsen, 2015/09/14 21:52:41]

Yes, there is no padding around handles in aura resources.

+}
+
 }  // namespace ui