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

Side by Side Diff: ash/wm/workspace/workspace_layout_manager.cc

Issue 9784010: Fixes bug where maximized window wasn't getting resized when toggling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.h ('k') | no next file » | 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/workspace/workspace_layout_manager.h" 5 #include "ash/wm/workspace/workspace_layout_manager.h"
6 6
7 #include "ash/screen_ash.h" 7 #include "ash/screen_ash.h"
8 #include "ash/wm/property_util.h" 8 #include "ash/wm/property_util.h"
9 #include "ash/wm/window_animations.h" 9 #include "ash/wm/window_animations.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 void WorkspaceLayoutManager::SetChildBounds( 93 void WorkspaceLayoutManager::SetChildBounds(
94 aura::Window* child, 94 aura::Window* child,
95 const gfx::Rect& requested_bounds) { 95 const gfx::Rect& requested_bounds) {
96 if (GetTrackedByWorkspace(child)) 96 if (GetTrackedByWorkspace(child))
97 BaseLayoutManager::SetChildBounds(child, requested_bounds); 97 BaseLayoutManager::SetChildBounds(child, requested_bounds);
98 else 98 else
99 SetChildBoundsDirect(child, requested_bounds); 99 SetChildBoundsDirect(child, requested_bounds);
100 workspace_manager_->UpdateShelfVisibility(); 100 workspace_manager_->UpdateShelfVisibility();
101 } 101 }
102 102
103 void WorkspaceLayoutManager::OnMonitorWorkAreaInsetsChanged() {
104 // The workspace is currently the only one that updates the shelf, so we can
105 // safely ignore this. If we don't there are timing issues when transitioning
106 // between maximized/fullscreen windows and normal windows.
107 }
108
109 void WorkspaceLayoutManager::OnWindowPropertyChanged(aura::Window* window, 103 void WorkspaceLayoutManager::OnWindowPropertyChanged(aura::Window* window,
110 const void* key, 104 const void* key,
111 intptr_t old) { 105 intptr_t old) {
112 BaseLayoutManager::OnWindowPropertyChanged(window, key, old); 106 BaseLayoutManager::OnWindowPropertyChanged(window, key, old);
113 if (key == aura::client::kShowStateKey && 107 if (key == aura::client::kShowStateKey &&
114 workspace_manager_->IsManagedWindow(window)) { 108 workspace_manager_->IsManagedWindow(window)) {
115 ShowStateChanged(window, static_cast<ui::WindowShowState>(old)); 109 ShowStateChanged(window, static_cast<ui::WindowShowState>(old));
116 } else if (key == ash::kWindowTrackedByWorkspaceSplitPropKey && 110 } else if (key == ash::kWindowTrackedByWorkspaceSplitPropKey &&
117 ash::GetTrackedByWorkspace(window)) { 111 ash::GetTrackedByWorkspace(window)) {
118 // We currently don't need to support transitioning from true to false, so 112 // We currently don't need to support transitioning from true to false, so
(...skipping 30 matching lines...) Expand all
149 // sure it's visible. 143 // sure it's visible.
150 window->Show(); 144 window->Show();
151 } 145 }
152 return; 146 return;
153 } 147 }
154 workspace_manager_->ShowStateChanged(window); 148 workspace_manager_->ShowStateChanged(window);
155 } 149 }
156 150
157 } // namespace internal 151 } // namespace internal
158 } // namespace ash 152 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698