Cros Tablet Window management - Split Screen part II

ash/wm/overview/overview_window_drag_controller.cc

+// Copyright 2017 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 "ash/wm/overview/overview_window_drag_controller.h"
+
+#include "ash/screen_util.h"
+#include "ash/shell.h"
+#include "ash/wm/overview/scoped_transform_overview_window.h"
+#include "ash/wm/overview/window_selector.h"
+#include "ash/wm/overview/window_selector_item.h"
+#include "ash/wm/splitview/split_view_controller.h"
+#include "ash/wm/window_positioning_utils.h"
+#include "ash/wm/window_state.h"
+#include "ash/wm/wm_event.h"
+#include "ash/wm/workspace/phantom_window_controller.h"
+#include "ui/aura/window.h"
+#include "ui/wm/core/coordinate_conversion.h"
+
+namespace ash {
+
+namespace {
+
+// The minimum offset that will be considered as a drag event.
+const int kMinimiumDragOffset = 5;
+
+// Snapping distance between the dragged window with the screen edge. It's
+// useful especially for touch events.
+const int kScreenEdgeInsetForDrag = 200;
+
+}  // namespace
+
+OverviewWindowDragController::OverviewWindowDragController(
+    WindowSelector* window_selector)
+    : window_selector_(window_selector),
+      split_view_controller_(Shell::Get()->split_view_controller()) {}
+
+OverviewWindowDragController::~OverviewWindowDragController() {}
+
+void OverviewWindowDragController::InitiateDrag(
+    WindowSelectorItem* item,
+    const gfx::Point& location_in_screen) {
+  previous_event_location_ = location_in_screen;
+  item_ = item;
+}
+
+void OverviewWindowDragController::Drag(const gfx::Point& location_in_screen) {
+  if (!did_move_ &&
+      (std::abs(location_in_screen.x() - previous_event_location_.x()) <
+           kMinimiumDragOffset ||
+       std::abs(location_in_screen.y() - previous_event_location_.y()) <
+           kMinimiumDragOffset)) {
+    return;
+  }
+  did_move_ = true;
+
+  // Updates the dragged |item_|'s bounds accordingly.

[varkha, 2017/06/30 16:32:26]

nit: not a method declaration so 'updates' -> 'update'

[xdai1, 2017/07/06 00:35:49]

Done.

+  gfx::Rect bounds(item_->target_bounds());
+  bounds.Offset(location_in_screen.x() - previous_event_location_.x(),
+                location_in_screen.y() - previous_event_location_.y());
+  item_->SetBounds(bounds, OverviewAnimationType::OVERVIEW_ANIMATION_NONE);
+  previous_event_location_ = location_in_screen;
+
+  UpdatePhantomWindow(location_in_screen);
+}
+
+void OverviewWindowDragController::CompleteDrag() {
+  phantom_window_controller_.reset();
+
+  if (!did_move_) {
+    // If no drag was initiated (e.g., a click/tap on the overview window),
+    // activate the window. If the split view is active and has a left window,
+    // snap the current window to right. If the split view is active and has a
+    // right window, snap the current window to left.
+    SplitViewController::State split_state = split_view_controller_->state();
+    if (split_state == SplitViewController::NO_SNAP)
+      window_selector_->SelectWindow(item_);
+    else if (split_state == SplitViewController::LEFT_SNAPPED)

[varkha, 2017/06/30 16:32:26]

Maybe just a bit simpler:
} else {
  SnapWindow(split_state == SplitViewController::LEFT_SNAPPED ? SNAP_RIGHT
                                                              : SNAP_LEFT);
}

Or maybe even think if the two similar enums could be merged (e.g. if this class
could just use SplitViewController::*SNAP* values.

[xdai1, 2017/07/06 00:35:49]

I merged OverviewWindowDragController::SnapType enum to
SplitViewController::SnapPosition enum.

+      SnapWindow(SNAP_RIGHT);
+    else
+      SnapWindow(SNAP_LEFT);
+  } else {
+    // If the window was dragged around but should not be snapped, move it back
+    // to overview window grid.
+    if (snap_type_ == SNAP_NONE)
+      window_selector_->PositionWindows(true /* animate */);
+    else if (snap_type_ == SNAP_LEFT)

[varkha, 2017/06/30 16:32:26]

Would this work:
else
  SnapWindow(snap_type_);

[xdai1, 2017/07/06 00:35:49]

Done.

+      SnapWindow(SNAP_LEFT);
+    else
+      SnapWindow(SNAP_RIGHT);
+    did_move_ = false;
+  }
+}
+
+void OverviewWindowDragController::UpdatePhantomWindow(
+    const gfx::Point& location_in_screen) {
+  SnapType last_snap_type = snap_type_;
+  snap_type_ = GetSnapType(location_in_screen);
+  if (snap_type_ == SNAP_NONE || snap_type_ != last_snap_type) {
+    phantom_window_controller_.reset();
+    if (snap_type_ == SNAP_NONE)
+      return;
+  }
+
+  const bool can_snap = snap_type_ != SNAP_NONE &&
+                        wm::GetWindowState(item_->GetWindow())->CanSnap();
+  if (!can_snap) {
+    snap_type_ = SNAP_NONE;
+    phantom_window_controller_.reset();
+    return;
+  }
+
+  aura::Window* target_window = item_->GetWindow();
+  SplitViewController::State snap_type =
+      (snap_type_ == SNAP_LEFT) ? SplitViewController::LEFT_SNAPPED
+                                : SplitViewController::RIGHT_SNAPPED;
+  gfx::Rect phantom_bounds_in_screen =
+      split_view_controller_->GetSnappedWindowBoundsInScreen(target_window,
+                                                             snap_type);
+
+  if (!phantom_window_controller_) {
+    phantom_window_controller_ =
+        base::MakeUnique<PhantomWindowController>(target_window);
+  }
+  phantom_window_controller_->Show(phantom_bounds_in_screen);
+}
+
+OverviewWindowDragController::SnapType
+OverviewWindowDragController::GetSnapType(
+    const gfx::Point& location_in_screen) {
+  gfx::Rect area(
+      ScreenUtil::GetDisplayWorkAreaBoundsInParent(item_->GetWindow()));
+  ::wm::ConvertRectToScreen(item_->GetWindow()->GetRootWindow(), &area);
+  area.Inset(kScreenEdgeInsetForDrag, 0);
+
+  if (location_in_screen.x() <= area.x())
+    return SNAP_LEFT;
+  if (location_in_screen.x() >= area.right() - 1)
+    return SNAP_RIGHT;
+  return SNAP_NONE;
+}
+
+void OverviewWindowDragController::SnapWindow(SnapType snap_type) {
+  DCHECK_NE(snap_type, SNAP_NONE);
+
+  item_->EnsureVisible();
+  item_->RestoreWindow();
+
+  // |item_| will be deleted after RemoveWindowSelectorItem().
+  aura::Window* window = item_->GetWindow();
+  window_selector_->RemoveWindowSelectorItem(item_);
+  (snap_type == SNAP_LEFT) ? split_view_controller_->SetLeftWindow(window)
+                           : split_view_controller_->SetRightWindow(window);
+  item_ = nullptr;
+}
+
+}  // namespace ash