Commit e5c03526 authored by wutao's avatar wutao Committed by Commit Bot

app_list: Make corner radius same as search page

This patch matches the corner radius of assistant page and the search
result page. Also, since we have a mask layer, remove the background's
corner radius.

Bug: 924624
Test: manual
Change-Id: I640d1cd1d52495a9cd2ed405c16eaecc9cb9781c
Reviewed-on: https://chromium-review.googlesource.com/c/1496297Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Tao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636877}
parent e31bce7c
...@@ -40,13 +40,11 @@ void AssistantPageView::InitLayout() { ...@@ -40,13 +40,11 @@ void AssistantPageView::InitLayout() {
SetPaintToLayer(); SetPaintToLayer();
layer()->SetFillsBoundsOpaquely(false); layer()->SetFillsBoundsOpaquely(false);
SetBackground(views::CreateBackgroundFromPainter( SetBackground(views::CreateSolidBackground(SK_ColorWHITE));
views::Painter::CreateSolidRoundRectPainter(
SK_ColorWHITE, search_box::kSearchBoxBorderCornerRadius)));
mask_ = views::Painter::CreatePaintedLayer( mask_ = views::Painter::CreatePaintedLayer(
views::Painter::CreateSolidRoundRectPainter( views::Painter::CreateSolidRoundRectPainter(
SK_ColorBLACK, search_box::kSearchBoxBorderCornerRadius)); SK_ColorBLACK, search_box::kSearchBoxBorderCornerRadiusSearchResult));
mask_->layer()->SetFillsBoundsOpaquely(false); mask_->layer()->SetFillsBoundsOpaquely(false);
layer()->SetMaskLayer(mask_->layer()); layer()->SetMaskLayer(mask_->layer());
......
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