diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 15:09:13 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 15:10:36 +0000 |
| commit | a105bc04f43ec8194b51796d4d59ec6dcec86acc (patch) | |
| tree | 2b6e940644b005def4fc830d9b56652d918a0a02 /athena/wm | |
| parent | 935ae1dcbd5352a19ff292534adec4c792e0506f (diff) | |
| download | chromium_src-a105bc04f43ec8194b51796d4d59ec6dcec86acc.zip chromium_src-a105bc04f43ec8194b51796d4d59ec6dcec86acc.tar.gz chromium_src-a105bc04f43ec8194b51796d4d59ec6dcec86acc.tar.bz2 | |
Make the minimized home card not overlap activities on Athena
BUG=402509
TEST=Manual, see bug
NOTRY=true
Review URL: https://codereview.chromium.org/465803002
Cr-Commit-Position: refs/heads/master@{#291072}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/wm')
| -rw-r--r-- | athena/wm/split_view_controller.cc | 6 | ||||
| -rw-r--r-- | athena/wm/window_manager_impl.cc | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/athena/wm/split_view_controller.cc b/athena/wm/split_view_controller.cc index cf39f2e..6e4a1c3 100644 --- a/athena/wm/split_view_controller.cc +++ b/athena/wm/split_view_controller.cc @@ -168,9 +168,9 @@ void SplitViewController::OnAnimationCompleted(aura::Window* window) { return; DCHECK(window == left_window_ || window == right_window_); if (state_ == ACTIVE) { - gfx::Rect window_bounds = gfx::Rect(container_->bounds().size()); - int container_width = window_bounds.width(); - window_bounds.set_width(container_width / 2); + int container_width = container_->bounds().width(); + gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); + gfx::Rect window_bounds(container_width / 2, display.work_area().height()); window->SetTransform(gfx::Transform()); if (window == left_window_) { left_window_->SetBounds(window_bounds); diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc index 857256d..638ea88 100644 --- a/athena/wm/window_manager_impl.cc +++ b/athena/wm/window_manager_impl.cc @@ -101,13 +101,14 @@ void AthenaContainerLayoutManager::OnWindowAddedToLayout(aura::Window* child) { aura::Window::Windows list = instance->window_list_provider_->GetWindowList(); if (std::find(list.begin(), list.end(), child) == list.end()) return; - aura::Window* window = NULL; - if (instance->split_view_controller_->IsSplitViewModeActive()) - window = instance->split_view_controller_->left_window(); - else - window = instance->container_.get(); - CHECK(window); - child->SetBounds(gfx::Rect(window->bounds().size())); + gfx::Size size; + if (instance->split_view_controller_->IsSplitViewModeActive()) { + size = instance->split_view_controller_->left_window()->bounds().size(); + } else { + size = + gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().size(); + } + child->SetBounds(gfx::Rect(size)); } void AthenaContainerLayoutManager::OnWillRemoveWindowFromLayout( |