CrOS Tablet Window management - Split Screen part I

ash/wm/maximize_mode/maximize_mode_window_state.cc

 // Copyright 2014 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/maximize_mode/maximize_mode_window_state.h"
 
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/screen_util.h"
 #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"
 #include "ash/wm/wm_event.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
@@ skipping 41 matching lines @@
       ScreenUtil::GetDisplayWorkAreaBoundsInParent(state_object->window());
   work_area_in_parent.ClampToCenteredSize(bounds_in_parent.size());
   return work_area_in_parent;
 }
 
 // Returns the maximized/full screen and/or centered bounds of a window.
 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()) {
     bounds_in_parent.set_size(GetMaximumSizeOfWindow(state_object));
   } else {
     // We prefer the user given window dimensions over the current windows
     // dimensions since they are likely to be the result from some other state
     // object logic.
     if (state_object->HasRestoreBounds())
       bounds_in_parent = state_object->GetRestoreBoundsInParent();
@@ skipping 77 matching lines @@
       if (!Shell::Get()->screen_pinning_controller()->IsPinned())
         UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_TRUSTED_PINNED, true);
       break;
     case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION:
     case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE:
     case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE:
     case wm::WM_EVENT_TOGGLE_MAXIMIZE:
     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;
     case wm::WM_EVENT_SHOW_INACTIVE:
       return;
     case wm::WM_EVENT_SET_BOUNDS:
       if (current_state_type_ == wm::WINDOW_STATE_TYPE_MAXIMIZED) {
         // Having a maximized window, it could have been created with an empty
         // size and the caller should get his size upon leaving the maximized
         // mode. As such we set the restore bounds to the requested bounds.
@@ skipping 78 matching lines @@
 
 void MaximizeModeWindowState::UpdateWindow(wm::WindowState* window_state,
                                            wm::WindowStateType target_state,
                                            bool animated) {
   DCHECK(target_state == wm::WINDOW_STATE_TYPE_MINIMIZED ||
          target_state == wm::WINDOW_STATE_TYPE_MAXIMIZED ||
          target_state == wm::WINDOW_STATE_TYPE_PINNED ||
          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)
       return;
     // If the state type did not change, update it accordingly.
     UpdateBounds(window_state, animated);
     return;
   }
 
   const wm::WindowStateType old_state_type = current_state_type_;
   current_state_type_ = target_state;
   window_state->UpdateWindowPropertiesFromStateType();
   window_state->NotifyPreStateTypeChange(old_state_type);
 
   if (target_state == wm::WINDOW_STATE_TYPE_MINIMIZED) {
     ::wm::SetWindowVisibilityAnimationType(
         window_state->window(), wm::WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
     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);
   }
 
   window_state->NotifyPostStateTypeChange(old_state_type);
 
   if (old_state_type == wm::WINDOW_STATE_TYPE_PINNED ||
       target_state == wm::WINDOW_STATE_TYPE_PINNED ||
       old_state_type == wm::WINDOW_STATE_TYPE_TRUSTED_PINNED ||
       target_state == wm::WINDOW_STATE_TYPE_TRUSTED_PINNED) {
@@ skipping 33 matching lines @@
       // avoid flashing.
       if (window_state->IsMaximized())
         window_state->SetBoundsDirectCrossFade(bounds_in_parent);
       else
         window_state->SetBoundsDirectAnimated(bounds_in_parent);
     }
   }
 }
 
 }  // namespace ash