diff options
author | flackr <flackr@chromium.org> | 2015-10-06 17:25:43 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-07 00:26:25 +0000 |
commit | 3b1223f0141025bb7f2478fa17b8b3473430ae72 (patch) | |
tree | 030bbf7d259e411f60b4aac02b69b7df2d58d6f3 /ash | |
parent | bccf4d75f7e9eaa4cc0f0aa0ff223e2e9f3b71e1 (diff) | |
download | chromium_src-3b1223f0141025bb7f2478fa17b8b3473430ae72.zip chromium_src-3b1223f0141025bb7f2478fa17b8b3473430ae72.tar.gz chromium_src-3b1223f0141025bb7f2478fa17b8b3473430ae72.tar.bz2 |
Only include normal type windows in the bounding box of an overview item.
BUG=448388
TEST=With 2 or more maximized windows, enter overview and position the mouse where an image link will move under during the transition. Then exit and reenter overview without moving the mouse. The two windows should still be the same size as each other.
Review URL: https://codereview.chromium.org/1384953005
Cr-Commit-Position: refs/heads/master@{#352724}
Diffstat (limited to 'ash')
-rw-r--r-- | ash/wm/overview/scoped_transform_overview_window.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/wm/overview/scoped_transform_overview_window.cc b/ash/wm/overview/scoped_transform_overview_window.cc index a3ebe83..993dcac 100644 --- a/ash/wm/overview/scoped_transform_overview_window.cc +++ b/ash/wm/overview/scoped_transform_overview_window.cc @@ -225,6 +225,12 @@ bool ScopedTransformOverviewWindow::Contains(const aura::Window* target) const { gfx::Rect ScopedTransformOverviewWindow::GetTargetBoundsInScreen() const { gfx::Rect bounds; for (const auto& window : GetTransientTreeIterator(window_)) { + // Ignore other window types when computing bounding box of window + // selector target item. + if (window != window_ && window->type() != ui::wm::WINDOW_TYPE_NORMAL && + window->type() != ui::wm::WINDOW_TYPE_PANEL) { + continue; + } bounds.Union(ScreenUtil::ConvertRectToScreen(window->parent(), window->GetTargetBounds())); } |