| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/default_window_resizer.h" | 5 #include "ash/wm/default_window_resizer.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/wm/window_state.h" | 8 #include "ash/wm/window_state.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/env.h" | 10 #include "ui/aura/env.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 DefaultWindowResizer::Create(aura::Window* window, | 25 DefaultWindowResizer::Create(aura::Window* window, |
| 26 const gfx::Point& location, | 26 const gfx::Point& location, |
| 27 int window_component, | 27 int window_component, |
| 28 aura::client::WindowMoveSource source) { | 28 aura::client::WindowMoveSource source) { |
| 29 Details details(window, location, window_component, source); | 29 Details details(window, location, window_component, source); |
| 30 return details.is_resizable ? new DefaultWindowResizer(details) : NULL; | 30 return details.is_resizable ? new DefaultWindowResizer(details) : NULL; |
| 31 } | 31 } |
| 32 | 32 |
| 33 void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) { | 33 void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) { |
| 34 gfx::Rect bounds(CalculateBoundsForDrag(details_, location)); | 34 gfx::Rect bounds(CalculateBoundsForDrag(details_, location)); |
| 35 if (bounds != details_.window->bounds()) { | 35 if (bounds != GetTarget()->bounds()) { |
| 36 if (!did_move_or_resize_ && !details_.restore_bounds.IsEmpty()) | 36 if (!did_move_or_resize_ && !details_.restore_bounds.IsEmpty()) |
| 37 wm::GetWindowState(details_.window)->ClearRestoreBounds(); | 37 wm::GetWindowState(GetTarget())->ClearRestoreBounds(); |
| 38 did_move_or_resize_ = true; | 38 did_move_or_resize_ = true; |
| 39 details_.window->SetBounds(bounds); | 39 GetTarget()->SetBounds(bounds); |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 | 42 |
| 43 void DefaultWindowResizer::CompleteDrag() { | 43 void DefaultWindowResizer::CompleteDrag() { |
| 44 } | 44 } |
| 45 | 45 |
| 46 void DefaultWindowResizer::RevertDrag() { | 46 void DefaultWindowResizer::RevertDrag() { |
| 47 if (!did_move_or_resize_) | 47 if (!did_move_or_resize_) |
| 48 return; | 48 return; |
| 49 | 49 |
| 50 details_.window->SetBounds(details_.initial_bounds_in_parent); | 50 GetTarget()->SetBounds(details_.initial_bounds_in_parent); |
| 51 | 51 |
| 52 if (!details_.restore_bounds.IsEmpty()) | 52 if (!details_.restore_bounds.IsEmpty()) |
| 53 wm::GetWindowState(details_.window)->SetRestoreBoundsInScreen( | 53 wm::GetWindowState(GetTarget())->SetRestoreBoundsInScreen( |
| 54 details_.restore_bounds); | 54 details_.restore_bounds); |
| 55 } | 55 } |
| 56 | 56 |
| 57 aura::Window* DefaultWindowResizer::GetTarget() { | 57 aura::Window* DefaultWindowResizer::GetTarget() { |
| 58 return details_.window; | 58 return details_.window(); |
| 59 } | 59 } |
| 60 | 60 |
| 61 const gfx::Point& DefaultWindowResizer::GetInitialLocation() const { | 61 const gfx::Point& DefaultWindowResizer::GetInitialLocation() const { |
| 62 return details_.initial_location_in_parent; | 62 return details_.initial_location_in_parent; |
| 63 } | 63 } |
| 64 | 64 |
| 65 DefaultWindowResizer::DefaultWindowResizer(const Details& details) | 65 DefaultWindowResizer::DefaultWindowResizer(const Details& details) |
| 66 : details_(details), | 66 : details_(details), |
| 67 did_move_or_resize_(false) { | 67 did_move_or_resize_(false) { |
| 68 DCHECK(details_.is_resizable); | 68 DCHECK(details_.is_resizable); |
| 69 ash::Shell::GetInstance()->cursor_manager()->LockCursor(); | 69 ash::Shell::GetInstance()->cursor_manager()->LockCursor(); |
| 70 } | 70 } |
| 71 | 71 |
| 72 } // namespace aura | 72 } // namespace aura |
| OLD | NEW |