Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1110)

Side by Side Diff: ash/wm/default_window_resizer.cc

Issue 121153003: Prevents panels attached to shelf from docking (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevents panels attached to shelf from docking (nits) Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/default_window_resizer.h ('k') | ash/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/aura/window_delegate.h" 12 #include "ui/aura/window_delegate.h"
13 #include "ui/base/hit_test.h" 13 #include "ui/base/hit_test.h"
14 #include "ui/base/ui_base_types.h" 14 #include "ui/base/ui_base_types.h"
15 #include "ui/gfx/screen.h" 15 #include "ui/gfx/screen.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
19 DefaultWindowResizer::~DefaultWindowResizer() { 19 DefaultWindowResizer::~DefaultWindowResizer() {
20 ash::Shell::GetInstance()->cursor_manager()->UnlockCursor(); 20 ash::Shell::GetInstance()->cursor_manager()->UnlockCursor();
21 } 21 }
22 22
23 // static 23 // static
24 DefaultWindowResizer* 24 DefaultWindowResizer*
25 DefaultWindowResizer::Create(aura::Window* window, 25 DefaultWindowResizer::Create(wm::WindowState* window_state) {
26 const gfx::Point& location, 26 return new DefaultWindowResizer(window_state);
27 int window_component,
28 aura::client::WindowMoveSource source) {
29 Details details(window, location, window_component, source);
30 return details.is_resizable ? new DefaultWindowResizer(details) : NULL;
31 } 27 }
32 28
33 void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) { 29 void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) {
34 gfx::Rect bounds(CalculateBoundsForDrag(details_, location)); 30 gfx::Rect bounds(CalculateBoundsForDrag(location));
35 if (bounds != details_.window->bounds()) { 31 if (bounds != GetTarget()->bounds()) {
36 if (!did_move_or_resize_ && !details_.restore_bounds.IsEmpty()) 32 if (!did_move_or_resize_ && !details().restore_bounds.IsEmpty())
37 wm::GetWindowState(details_.window)->ClearRestoreBounds(); 33 window_state_->ClearRestoreBounds();
38 did_move_or_resize_ = true; 34 did_move_or_resize_ = true;
39 details_.window->SetBounds(bounds); 35 GetTarget()->SetBounds(bounds);
40 } 36 }
41 } 37 }
42 38
43 void DefaultWindowResizer::CompleteDrag() { 39 void DefaultWindowResizer::CompleteDrag() {
44 } 40 }
45 41
46 void DefaultWindowResizer::RevertDrag() { 42 void DefaultWindowResizer::RevertDrag() {
47 if (!did_move_or_resize_) 43 if (!did_move_or_resize_)
48 return; 44 return;
49 45
50 details_.window->SetBounds(details_.initial_bounds_in_parent); 46 GetTarget()->SetBounds(details().initial_bounds_in_parent);
51 47
52 if (!details_.restore_bounds.IsEmpty()) 48 if (!details().restore_bounds.IsEmpty())
53 wm::GetWindowState(details_.window)->SetRestoreBoundsInScreen( 49 window_state_->SetRestoreBoundsInScreen(details().restore_bounds);
54 details_.restore_bounds);
55 } 50 }
56 51
57 aura::Window* DefaultWindowResizer::GetTarget() { 52 DefaultWindowResizer::DefaultWindowResizer(wm::WindowState* window_state)
58 return details_.window; 53 : WindowResizer(window_state),
59 }
60
61 const gfx::Point& DefaultWindowResizer::GetInitialLocation() const {
62 return details_.initial_location_in_parent;
63 }
64
65 DefaultWindowResizer::DefaultWindowResizer(const Details& details)
66 : details_(details),
67 did_move_or_resize_(false) { 54 did_move_or_resize_(false) {
68 DCHECK(details_.is_resizable); 55 DCHECK(details().is_resizable);
69 ash::Shell::GetInstance()->cursor_manager()->LockCursor(); 56 ash::Shell::GetInstance()->cursor_manager()->LockCursor();
70 } 57 }
71 58
72 } // namespace aura 59 } // namespace aura
OLDNEW
« no previous file with comments | « ash/wm/default_window_resizer.h ('k') | ash/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698