Undocks window first before side-snapping bounds

ash/wm/window_state.cc

 // Copyright 2013 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/window_state.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_properties.h"
@@ skipping 57 matching lines @@
 
 bool WindowState::IsFullscreen() const {
   return GetShowState() == ui::SHOW_STATE_FULLSCREEN;
 }
 
 bool WindowState::IsMaximizedOrFullscreen() const {
   return IsMaximizedOrFullscreenState(GetShowState());
 }
 
 bool WindowState::IsNormalShowState() const {
   ui::WindowShowState state = window_->GetProperty(aura::client::kShowStateKey);

[pkotwicz, 2013/11/27 20:24:43]

In a separate CL we must absolutely kill this method. It is too confusing now
that snapped left / right are of state normal.

[varkha, 2013/11/28 01:09:37]

Yes.

   return state == ui::SHOW_STATE_NORMAL || state == ui::SHOW_STATE_DEFAULT;
 }
 
 bool WindowState::IsActive() const {
   return IsActiveWindow(window_);
 }
 
 bool WindowState::IsDocked() const {
   return window_->parent() &&
       window_->parent()->id() == internal::kShellWindowId_DockedContainer;
 }
 
+bool WindowState::IsSnapped() const {
+  return window_show_type_ == SHOW_TYPE_LEFT_SNAPPED ||
+      window_show_type_ == SHOW_TYPE_RIGHT_SNAPPED;
+}
+
 bool WindowState::CanMaximize() const {
   return window_->GetProperty(aura::client::kCanMaximizeKey);
 }
 
 bool WindowState::CanMinimize() const {
   internal::RootWindowController* controller =
       internal::RootWindowController::ForWindow(window_);
   if (!controller)
     return false;
   aura::Window* lockscreen = controller->GetContainer(
@@ skipping 28 matching lines @@
 
 void WindowState::Maximize() {
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 
 void WindowState::SnapLeft(const gfx::Rect& bounds) {
   SnapWindow(SHOW_TYPE_LEFT_SNAPPED, bounds);
 }
 
 void WindowState::SnapRight(const gfx::Rect& bounds) {
-  SnapWindow(SHOW_TYPE_LEFT_SNAPPED, bounds);
+  SnapWindow(SHOW_TYPE_RIGHT_SNAPPED, bounds);
 }
 
 void WindowState::Minimize() {
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
 }
 
 void WindowState::Unminimize() {
   window_->SetProperty(
       aura::client::kShowStateKey,
       window_->GetProperty(aura::client::kRestoreShowStateKey));
   window_->ClearProperty(aura::client::kRestoreShowStateKey);
 }
 
 void WindowState::Activate() {
   ActivateWindow(window_);
 }
 
 void WindowState::Deactivate() {
   DeactivateWindow(window_);
 }
 
 void WindowState::Restore() {
+  // When a window |IsSnapped| it is auto-positioned by layout manager to stay

[pkotwicz, 2013/11/27 20:24:43]

You can actually kill the if statement completely.
WindowState::OnWindowPropertyChanged() currently always sets |window_show_type_|
to SHOW_TYPE_NORMAL when the show state is ui::SHOW_STATE_NORMAL.

I suspect that WindowState::OnWindowPropertyChanged() should not have this
behavior but that's for a different CL.

[varkha, 2013/11/28 01:09:37]

I don't think we can rely on WindowState::OnWindowPropertyChanged() getting
invoked before other observers. Once we merge show type and show state this
problem will not exist, but this is for another CL.

+  // snapped at a screen edge. Stop this auto-positioning when Restore() is
+  // called such as at the end of a drag or when centering a window.
+  if (IsSnapped())
+    window_show_type_ = SHOW_TYPE_NORMAL;
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
 }
 
 void WindowState::ToggleMaximized() {
   if (IsMaximized())
     Restore();
   else if (CanMaximize())
     Maximize();
 }
 
@@ skipping 86 matching lines @@
         OnWindowShowTypeChanged(this, ToWindowShowType(old_state)));
   }
 }
 
 void WindowState::OnWindowDestroying(aura::Window* window) {
   window_->RemoveObserver(this);
 }
 
 void WindowState::SnapWindow(WindowShowType left_or_right,
                              const gfx::Rect& bounds) {
-  if (IsMaximizedOrFullscreen()) {
-    // Before we can set the bounds we need to restore the window.
-    // Restoring the window will set the window to its restored bounds.
-    // To avoid an unnecessary bounds changes (which may have side effects)
-    // we set the restore bounds to the bounds we want, restore the window,
-    // then reset the restore bounds. This way no unnecessary bounds
-    // changes occurs and the original restore bounds is remembered.
-    gfx::Rect restore_bounds_in_screen =
-        GetRestoreBoundsInScreen();
-    SetRestoreBoundsInParent(bounds);
+  // We set the restore bounds to the bounds we want, restore the window if
+  // necessary or set the bounds explicitly, then recover the restore bounds.
+  // This way no unnecessary bounds changes occurs and the original restore
+  // bounds are remembered.
+  gfx::Rect restore_bounds_in_screen(HasRestoreBounds() ?
+      GetRestoreBoundsInScreen() : window_->GetBoundsInScreen());
+  SetRestoreBoundsInParent(bounds);
+
+  bool was_maximized = IsMaximizedOrFullscreen();
+  // Before we can set the bounds we need to restore the window.
+  // Restoring the window will set the window to its restored bounds set above.
+  // Restore will cause OnWindowPropertyChanged() so it needs to be done
+  // before notifying that the WindowShowType has changed to |left_or_right|.
+  if (was_maximized)
     Restore();
-    SetRestoreBoundsInScreen(restore_bounds_in_screen);
-  } else {
-    window_->SetBounds(bounds);
-  }
   DCHECK(left_or_right == SHOW_TYPE_LEFT_SNAPPED ||
          left_or_right == SHOW_TYPE_RIGHT_SNAPPED);
+  WindowShowType old_type = window_show_type_;
   window_show_type_ = left_or_right;
+  FOR_EACH_OBSERVER(
+      WindowStateObserver, observer_list_,
+      OnWindowShowTypeChanged(this, old_type));
+  // TODO(varkha): Ideally the bounds should be changed in a LayoutManager upon
+  // observing the WindowShowType change.
+  // There is no need to SetBounds second time if a window used to be maximized.
+  // In that case the bounds were already set when Restore() was called above.
+  if (!was_maximized)
+    window_->SetBounds(bounds);
+  SetRestoreBoundsInScreen(restore_bounds_in_screen);
 }
 
 WindowState* GetActiveWindowState() {
   aura::Window* active = GetActiveWindow();
   return active ? GetWindowState(active) : NULL;
 }
 
 WindowState* GetWindowState(aura::Window* window) {
   if (!window)
     return NULL;
   WindowState* settings = window->GetProperty(internal::kWindowStateKey);
   if(!settings) {
     settings = new WindowState(window);
     window->SetProperty(internal::kWindowStateKey, settings);
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash