CrOS Tablet Window management - Split Screen part I

ash/wm/maximize_mode/maximize_mode_window_state.cc

Index: ash/wm/maximize_mode/maximize_mode_window_state.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc
index 989fff71822c8b40e44aafde767fd93ab2670b50..292b109bafa82bf8d1cfeff0525d34e713051ed4 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
@@ -11,6 +11,7 @@
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/wm/screen_pinning_controller.h"
+#include "ash/wm/splitview/split_view_controller.h"
 #include "ash/wm/window_animation_types.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_util.h"
@@ -72,6 +73,18 @@ gfx::Rect GetBoundsInMaximizedMode(wm::WindowState* state_object) {
   if (state_object->IsFullscreen() || state_object->IsPinned())
     return ScreenUtil::GetDisplayBoundsInParent(state_object->window());
 
+  if (state_object->CanSnap() && SplitViewController::ShouldAllowSplitView() &&

[oshima, 2017/06/14 00:19:26]

do you need CanSnap check? I believe it shouldn't be snapped if CanSnap returns
false.

[xdai1, 2017/06/15 22:11:41]

Yes. Theoretically the state type won't be wm::WINDOW_STATE_TYPE_LEFT_SNAPPED or
wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED if CanSnap() is false.

Do you mind I keep this check? Because I don't want
SplitViewController::ShouldAllowSplitView() to be called in multiple places in
this file. (currently it's moved to CanSnap() function).

[oshima, 2017/06/16 01:20:56]

Please use DCHECK if that condition shouldn't happen but want to catch it if it
ever happens.

[xdai1, 2017/06/16 18:49:52]

Moved the CanSnap() to DCHECK.

+      state_object->GetStateType() == wm::WINDOW_STATE_TYPE_LEFT_SNAPPED) {
+    return Shell::Get()->split_view_controller()->GetLeftWindowBoundsInParent(

[oshima, 2017/06/14 00:19:26]

You may want to call it first, second as you most likely need to support
splitting to top and bottom.

[xdai1, 2017/06/15 22:11:41]

Do you mean put the two if-clause at top of this function? If so, Done.

[oshima, 2017/06/16 01:20:56]

I was going to remove this comment, sorry. You may put it back here or top is
fine too.

[xdai1, 2017/06/16 18:49:52]

Put it back here.

+        state_object->window());
+  }
+
+  if (state_object->CanSnap() && SplitViewController::ShouldAllowSplitView() &&
+      state_object->GetStateType() == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED) {
+    return Shell::Get()->split_view_controller()->GetRightWindowBoundsInParent(
+        state_object->window());
+  }
+
   gfx::Rect bounds_in_parent;
   // Make the window as big as possible.
   if (state_object->CanMaximize() || state_object->CanResize()) {
@@ -169,13 +182,27 @@ void MaximizeModeWindowState::OnWMEvent(wm::WindowState* window_state,
     case wm::WM_EVENT_CYCLE_SNAP_LEFT:
     case wm::WM_EVENT_CYCLE_SNAP_RIGHT:
     case wm::WM_EVENT_CENTER:
-    case wm::WM_EVENT_SNAP_LEFT:
-    case wm::WM_EVENT_SNAP_RIGHT:
     case wm::WM_EVENT_NORMAL:
     case wm::WM_EVENT_MAXIMIZE:
       UpdateWindow(window_state, GetMaximizedOrCenteredWindowType(window_state),
                    true);
       return;
+    case wm::WM_EVENT_SNAP_LEFT:
+      if (SplitViewController::ShouldAllowSplitView()) {
+        UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_LEFT_SNAPPED, true);
+      } else {
+        UpdateWindow(window_state,
+                     GetMaximizedOrCenteredWindowType(window_state), true);
+      }
+      return;
+    case wm::WM_EVENT_SNAP_RIGHT:
+      if (SplitViewController::ShouldAllowSplitView()) {
+        UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED, true);
+      } else {
+        UpdateWindow(window_state,
+                     GetMaximizedOrCenteredWindowType(window_state), true);
+      }
+      return;
     case wm::WM_EVENT_MINIMIZE:
       UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_MINIMIZED, true);
       return;
@@ -274,7 +301,9 @@ void MaximizeModeWindowState::UpdateWindow(wm::WindowState* window_state,
          target_state == wm::WINDOW_STATE_TYPE_TRUSTED_PINNED ||
          (target_state == wm::WINDOW_STATE_TYPE_NORMAL &&
           !window_state->CanMaximize()) ||
-         target_state == wm::WINDOW_STATE_TYPE_FULLSCREEN);
+         target_state == wm::WINDOW_STATE_TYPE_FULLSCREEN ||
+         target_state == wm::WINDOW_STATE_TYPE_LEFT_SNAPPED ||
+         target_state == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED);
 
   if (current_state_type_ == target_state) {
     if (target_state == wm::WINDOW_STATE_TYPE_MINIMIZED)
@@ -295,6 +324,17 @@ void MaximizeModeWindowState::UpdateWindow(wm::WindowState* window_state,
     window_state->window()->Hide();
     if (window_state->IsActive())
       window_state->Deactivate();
+  } else if (target_state == wm::WINDOW_STATE_TYPE_LEFT_SNAPPED ||
+             target_state == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED) {
+    gfx::Rect bounds =
+        (target_state == wm::WINDOW_STATE_TYPE_LEFT_SNAPPED)

[oshima, 2017/06/14 00:19:26]

it's probably simple to have two ifs. (just a guess, so you may leave it if you
think this is simpler)

[xdai1, 2017/06/15 22:11:41]

Done.

+            ? Shell::Get()
+                  ->split_view_controller()
+                  ->GetLeftWindowBoundsInParent(window_state->window())
+            : Shell::Get()
+                  ->split_view_controller()
+                  ->GetRightWindowBoundsInParent(window_state->window());
+    window_state->SetBoundsDirectAnimated(bounds);
   } else {
     UpdateBounds(window_state, animated);
   }