Commit 4cd7b9d2 authored by Yulun Wu's avatar Yulun Wu Committed by Commit Bot

App_list: Fix page switcher height in folder view.

This reverts changes from:

CL:1808426

which caused the ripple circle around the page switcher button to get cut off.

Bug: 1011518
Change-Id: I5da49ce4122cdb5dbf083eda6a8f23ec371f5946
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846012Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Reviewed-by: default avatarToni Baržić <tbarzic@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704450}
parent 2243f85e
......@@ -721,10 +721,13 @@ void AppListFolderView::CalculateIdealBounds() {
// Calculate bounds for page_switcher.
gfx::Rect page_switcher_frame(rect);
gfx::Size page_switcher_size = page_switcher_->GetPreferredSize();
page_switcher_size.set_height(GetAppListConfig().folder_header_height());
page_switcher_frame.set_x(page_switcher_frame.right() -
page_switcher_size.width());
page_switcher_frame.set_y(header_frame.y());
// The page switcher has a different height than the folder header, but it
// still needs to be aligned with it.
page_switcher_frame.set_y(
header_frame.y() -
(page_switcher_size.height() - header_frame.height()) / 2);
page_switcher_frame.set_size(page_switcher_size);
view_model_->set_ideal_bounds(kIndexPageSwitcher, page_switcher_frame);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment