Minor fix to touch selection logic.

views/touchui/touch_selection_controller_impl.cc

 // Copyright (c) 2011 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 "views/touchui/touch_selection_controller_impl.h"
 
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
@@ skipping 143 matching lines @@
 
 void TouchSelectionControllerImpl::SelectionChanged(const gfx::Point& p1,
                                                     const gfx::Point& p2) {
   gfx::Point screen_pos_1(p1);
   View::ConvertPointToScreen(client_view_, &screen_pos_1);
   gfx::Point screen_pos_2(p2);
   View::ConvertPointToScreen(client_view_, &screen_pos_2);
 
   if (dragging_handle_) {
     // We need to reposition only the selection handle that is being dragged.
-    // The other handle stays the same.
-    SelectionHandleView* fixed_handle = selection_handle_1_.get();
-    if (fixed_handle == dragging_handle_)
-      fixed_handle = selection_handle_2_.get();
-
-    gfx::Point fixed_handle_pos = fixed_handle->GetScreenPosition();
-    fixed_handle_pos.Offset(kSelectionHandleRadius, 0);
-
-    if (fixed_handle_pos == screen_pos_1)
-      dragging_handle_->SetScreenPosition(screen_pos_2);
-    else
-      dragging_handle_->SetScreenPosition(screen_pos_1);
+    // The other handle stays the same. Also, the selection handle being dragged
+    // will always be at the end of selection, while the other handle will be at
+    // the start.
+    dragging_handle_->SetScreenPosition(screen_pos_2);
   } else {
     // Check if there is any selection at all.
     if (screen_pos_1 == screen_pos_2) {
       selection_handle_1_->SetVisible(false);
       selection_handle_2_->SetVisible(false);
       return;
     }
 
-    if (client_view_->bounds().Contains(p1)) {
+    if (isPointInClientView(p1)) {
       selection_handle_1_->SetScreenPosition(screen_pos_1);
       selection_handle_1_->SetVisible(true);
     } else {
       selection_handle_1_->SetVisible(false);
     }
 
-    if (client_view_->bounds().Contains(p2)) {
+    if (isPointInClientView(p2)) {
       selection_handle_2_->SetScreenPosition(screen_pos_2);
       selection_handle_2_->SetVisible(true);
     } else {
       selection_handle_2_->SetVisible(false);
     }
   }
 }
 
 void TouchSelectionControllerImpl::ClientViewLostFocus() {
   selection_handle_1_->SetVisible(false);
@@ skipping 24 matching lines @@
 }
 
 void TouchSelectionControllerImpl::ConvertPointToClientView(
     SelectionHandleView* source, gfx::Point* point) {
   View::ConvertPointToScreen(source, point);
   gfx::Rect r = client_view_->GetWidget()->GetClientAreaScreenBounds();
   point->SetPoint(point->x() - r.x(), point->y() - r.y());
   View::ConvertPointFromWidget(client_view_, point);
 }
 
+bool TouchSelectionControllerImpl::isPointInClientView(const gfx::Point& p) {

[sky, 2011/08/22 14:21:37]

is -> Is

[varunjain, 2011/08/22 16:58:50]

Done.

+  gfx::Rect r = client_view_->bounds();
+  return p.x() >= r.x() && p.x() <= r.x() + r.width() &&

[sky, 2011/08/22 14:21:37]

return r.Contains(p)

[varunjain, 2011/08/22 16:58:50]

Rect::Contains checks for strict inclusion and returns false if the point lies
on the boundary of the rectangle. Thats the bug this change is fixing.

+      p.y() >= r.y() && p.y() <= r.y() + r.height();
+}
+
 gfx::Point TouchSelectionControllerImpl::GetSelectionHandle1Position() {
   return selection_handle_1_->GetScreenPosition();
 }
 
 gfx::Point TouchSelectionControllerImpl::GetSelectionHandle2Position() {
   return selection_handle_2_->GetScreenPosition();
 }
 
 bool TouchSelectionControllerImpl::IsSelectionHandle1Visible() {
   return selection_handle_1_->IsVisible();
 }
 
 bool TouchSelectionControllerImpl::IsSelectionHandle2Visible() {
   return selection_handle_2_->IsVisible();
 }
 
 TouchSelectionController* TouchSelectionController::create(
     TouchSelectionClientView* client_view) {
   return new TouchSelectionControllerImpl(client_view);
 }
 
 }  // namespace views