Index: ash/wm/dock/docked_window_layout_manager.cc |
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc |
index 91fe6c83ab798a45f4560b725463bf5d9ffe2bfe..d12d21741f7be4e5e1e969e6a47edcc8592af377 100644 |
--- a/ash/wm/dock/docked_window_layout_manager.cc |
+++ b/ash/wm/dock/docked_window_layout_manager.cc |
@@ -745,6 +745,8 @@ void DockedWindowLayoutManager::SetChildBounds( |
actual_new_bounds.set_height( |
std::max(min_size.height(), actual_new_bounds.height())); |
} |
+ if (IsUsedByLayout(child) && child != dragged_window_) |
oshima
2015/06/04 22:40:29
doesn't this prevent relayouting docked windows up
varkha
2015/06/04 23:22:00
No. Display change is handled in OnWindowResized()
|
+ return; |
SnapToPixelLayoutManager::SetChildBounds(child, actual_new_bounds); |
if (IsPopupOrTransient(child)) |
return; |