| 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/workspace/multi_window_resize_controller.h" | 5 #include "ash/wm/workspace/multi_window_resize_controller.h" |
| 6 | 6 |
| 7 #include "ash/screen_util.h" | 7 #include "ash/screen_util.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
| 10 #include "ash/wm/aura/wm_window_aura.h" |
| 10 #include "ash/wm/window_animations.h" | 11 #include "ash/wm/window_animations.h" |
| 11 #include "ash/wm/window_state_aura.h" | 12 #include "ash/wm/window_state_aura.h" |
| 12 #include "ash/wm/workspace/workspace_event_handler.h" | 13 #include "ash/wm/workspace/workspace_event_handler.h" |
| 13 #include "ash/wm/workspace/workspace_window_resizer.h" | 14 #include "ash/wm/workspace/workspace_window_resizer.h" |
| 14 #include "grit/ash_resources.h" | 15 #include "grit/ash_resources.h" |
| 15 #include "ui/aura/client/screen_position_client.h" | 16 #include "ui/aura/client/screen_position_client.h" |
| 16 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
| 17 #include "ui/aura/window_delegate.h" | 18 #include "ui/aura/window_delegate.h" |
| 18 #include "ui/aura/window_event_dispatcher.h" | 19 #include "ui/aura/window_event_dispatcher.h" |
| 19 #include "ui/base/hit_test.h" | 20 #include "ui/base/hit_test.h" |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 FindWindowsTouching(windows_.window2, windows_.direction, | 440 FindWindowsTouching(windows_.window2, windows_.direction, |
| 440 &windows_.other_windows); | 441 &windows_.other_windows); |
| 441 for (size_t i = 0; i < windows_.other_windows.size(); ++i) { | 442 for (size_t i = 0; i < windows_.other_windows.size(); ++i) { |
| 442 windows_.other_windows[i]->AddObserver(this); | 443 windows_.other_windows[i]->AddObserver(this); |
| 443 windows.push_back(windows_.other_windows[i]); | 444 windows.push_back(windows_.other_windows[i]); |
| 444 } | 445 } |
| 445 int component = windows_.direction == LEFT_RIGHT ? HTRIGHT : HTBOTTOM; | 446 int component = windows_.direction == LEFT_RIGHT ? HTRIGHT : HTBOTTOM; |
| 446 wm::WindowState* window_state = wm::GetWindowState(windows_.window1); | 447 wm::WindowState* window_state = wm::GetWindowState(windows_.window1); |
| 447 window_state->CreateDragDetails(location_in_parent, component, | 448 window_state->CreateDragDetails(location_in_parent, component, |
| 448 aura::client::WINDOW_MOVE_SOURCE_MOUSE); | 449 aura::client::WINDOW_MOVE_SOURCE_MOUSE); |
| 449 window_resizer_.reset(WorkspaceWindowResizer::Create(window_state, windows)); | 450 window_resizer_.reset(WorkspaceWindowResizer::Create( |
| 451 window_state, wm::WmWindowAura::FromAuraWindows(windows))); |
| 450 | 452 |
| 451 // Do not hide the resize widget while a drag is active. | 453 // Do not hide the resize widget while a drag is active. |
| 452 mouse_watcher_.reset(); | 454 mouse_watcher_.reset(); |
| 453 } | 455 } |
| 454 | 456 |
| 455 void MultiWindowResizeController::Resize(const gfx::Point& location_in_screen, | 457 void MultiWindowResizeController::Resize(const gfx::Point& location_in_screen, |
| 456 int event_flags) { | 458 int event_flags) { |
| 457 gfx::Point location_in_parent(location_in_screen); | 459 gfx::Point location_in_parent(location_in_screen); |
| 458 aura::client::GetScreenPositionClient(windows_.window1->GetRootWindow())-> | 460 aura::client::GetScreenPositionClient(windows_.window1->GetRootWindow())-> |
| 459 ConvertPointFromScreen(windows_.window1->parent(), &location_in_parent); | 461 ConvertPointFromScreen(windows_.window1->parent(), &location_in_parent); |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 bool MultiWindowResizeController::IsOverComponent( | 575 bool MultiWindowResizeController::IsOverComponent( |
| 574 aura::Window* window, | 576 aura::Window* window, |
| 575 const gfx::Point& location_in_screen, | 577 const gfx::Point& location_in_screen, |
| 576 int component) const { | 578 int component) const { |
| 577 gfx::Point window_loc(location_in_screen); | 579 gfx::Point window_loc(location_in_screen); |
| 578 ::wm::ConvertPointFromScreen(window, &window_loc); | 580 ::wm::ConvertPointFromScreen(window, &window_loc); |
| 579 return window->delegate()->GetNonClientComponent(window_loc) == component; | 581 return window->delegate()->GetNonClientComponent(window_loc) == component; |
| 580 } | 582 } |
| 581 | 583 |
| 582 } // namespace ash | 584 } // namespace ash |
| OLD | NEW |