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

Unified Diff: ash/wm/workspace/workspace_window_resizer.cc

Issue 13896026: Stick windows to sides of workspaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dock with zero width (no logs) Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« ash/wm/dock/dock_window_resizer.cc ('K') | « ash/wm/workspace/workspace_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer.cc
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
index 25430933827c63762fb0e9b7dcc1cc1d348f5370..6af3c530d5765f68fcb75711c6e15d5aea02e379 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -16,6 +16,8 @@
#include "ash/shell_window_ids.h"
#include "ash/wm/coordinate_conversion.h"
#include "ash/wm/default_window_resizer.h"
+#include "ash/wm/dock/dock_layout_manager.h"
+#include "ash/wm/dock/dock_window_resizer.h"
#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/panels/panel_window_resizer.h"
#include "ash/wm/property_util.h"
@@ -44,6 +46,17 @@ scoped_ptr<WindowResizer> CreateWindowResizer(aura::Window* window,
if (!wm::CanResizeWindow(window) && window_component != HTCAPTION)
return scoped_ptr<WindowResizer>();
+ // TODO(varkha): The chaining of window resizers causes some of the logic
+ // to be repeated and the logic flow difficult to control. With some windows
+ // classes using reparenting during drag operations it becomes challenging to
+ // implement proper transition from one resizer to another during or at the
+ // end of the drag. This also causes http://crbug.com/247085.
+ // It seems the only thing the panel or dock resizer needs to do is notify the
+ // layout manager when a docked window is being dragged. We should have a
+ // better way of doing this, perhaps by having a way of observing drags or
+ // having a generic drag window wrapper which informs a layout manager that a
+ // drag has started or stopped.
+ // It may be possible to refactor and eliminate chaining.
WindowResizer* window_resizer = NULL;
if (window->parent() &&
window->parent()->id() == internal::kShellWindowId_WorkspaceContainer) {
@@ -65,6 +78,10 @@ scoped_ptr<WindowResizer> CreateWindowResizer(aura::Window* window,
window_resizer = internal::DragWindowResizer::Create(
window_resizer, window, point_in_parent, window_component);
}
+ if (window_resizer && IsWindowDocked(window)) {
+ window_resizer = DockWindowResizer::Create(
+ window_resizer, window, point_in_parent, window_component);
+ }
if (window_resizer && window->type() == aura::client::WINDOW_TYPE_PANEL) {
window_resizer = PanelWindowResizer::Create(
window_resizer, window, point_in_parent, window_component);
@@ -368,7 +385,7 @@ void WorkspaceWindowResizer::CompleteDrag(int event_flags) {
if (!did_move_or_resize_ || details_.window_component != HTCAPTION)
return;
- // When the window is not in the normal show state, we do not snap thw window.
+ // When the window is not in the normal show state, we do not snap the window.
// This happens when the user minimizes or maximizes the window by keyboard
// shortcut while dragging it. If the window is the result of dragging a tab
// out of a maximized window, it's already in the normal show state when this
« ash/wm/dock/dock_window_resizer.cc ('K') | « ash/wm/workspace/workspace_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698