summaryrefslogtreecommitdiffstats
path: root/ash/shelf
diff options
context:
space:
mode:
authorsimonhong@chromium.org <simonhong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 06:15:41 +0000
committersimonhong@chromium.org <simonhong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 06:15:41 +0000
commita3f1159b93835be0f25d0dd3efc9a05b3cd6559a (patch)
tree5efe19cbc3edf604b76d135d37a184e5a5dde2f7 /ash/shelf
parent68786b30bfb0c268c1a3914ebcd200a80a1cb79e (diff)
downloadchromium_src-a3f1159b93835be0f25d0dd3efc9a05b3cd6559a.zip
chromium_src-a3f1159b93835be0f25d0dd3efc9a05b3cd6559a.tar.gz
chromium_src-a3f1159b93835be0f25d0dd3efc9a05b3cd6559a.tar.bz2
[ash] Preferred size of ShelfView is not fixed when item is animating
Problem: When an item is dragged in overflow bubble to left or right, item and bubble are flickered. The reason for this is preferred shelf view size is based on item's bounds which is not a fixed value when it is in animating. Instead, ideal bounds is more better to get the shelf view's preferred size. R=xiyuan@chromium.org, jamescook@chromium.org BUG=316101 TEST=visual test Review URL: https://codereview.chromium.org/68263024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
-rw-r--r--ash/shelf/shelf_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index d13f70c..61f61d9 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -1381,7 +1381,7 @@ gfx::Size ShelfView::GetPreferredSize() {
const gfx::Rect last_button_bounds =
last_button_index >= first_visible_index_ ?
- view_model_->view_at(last_button_index)->bounds() :
+ view_model_->ideal_bounds(last_button_index) :
gfx::Rect(gfx::Size(preferred_size, preferred_size));
if (layout_manager_->IsHorizontalAlignment()) {