Commit e2d14d46 authored by Daniel Zhang's avatar Daniel Zhang Committed by Commit Bot

cros: Change padding of AppList item titles.

Change padding of title label in AppListItemView
from 0px to 8px to match specifications:

https://screenshot.googleplex.com/bmrE2eaixE0

Bug: 876503
Change-Id: Id12b3ddfe4bc95372d236b81468e25db5db576b5
Reviewed-on: https://chromium-review.googlesource.com/1186098Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarAlex Newcomer <newcomer@chromium.org>
Commit-Queue: Daniel Zhang <oxyflush@google.com>
Cr-Commit-Position: refs/heads/master@{#585570}
parent 6065c1d6
...@@ -761,7 +761,9 @@ gfx::Rect AppListItemView::GetTitleBoundsForTargetViewBounds( ...@@ -761,7 +761,9 @@ gfx::Rect AppListItemView::GetTitleBoundsForTargetViewBounds(
const gfx::Rect& target_bounds, const gfx::Rect& target_bounds,
const gfx::Size& title_size) { const gfx::Size& title_size) {
gfx::Rect rect(target_bounds); gfx::Rect rect(target_bounds);
rect.Inset(0, AppListConfig::instance().grid_title_top_padding(), 0, 0); rect.Inset(AppListConfig::instance().grid_title_horizontal_padding(),
AppListConfig::instance().grid_title_top_padding(),
AppListConfig::instance().grid_title_horizontal_padding(), 0);
rect.ClampToCenteredSize(title_size); rect.ClampToCenteredSize(title_size);
return rect; return rect;
} }
......
...@@ -17,6 +17,7 @@ AppListConfig::AppListConfig() ...@@ -17,6 +17,7 @@ AppListConfig::AppListConfig()
grid_icon_dimension_(48), grid_icon_dimension_(48),
grid_icon_bottom_padding_(3), grid_icon_bottom_padding_(3),
grid_title_top_padding_(86), grid_title_top_padding_(86),
grid_title_horizontal_padding_(8),
grid_title_width_(80), grid_title_width_(80),
grid_title_color_(SK_ColorWHITE), grid_title_color_(SK_ColorWHITE),
grid_focus_dimension_(64), grid_focus_dimension_(64),
......
...@@ -31,6 +31,9 @@ class ASH_PUBLIC_EXPORT AppListConfig { ...@@ -31,6 +31,9 @@ class ASH_PUBLIC_EXPORT AppListConfig {
int grid_icon_dimension() const { return grid_icon_dimension_; } int grid_icon_dimension() const { return grid_icon_dimension_; }
int grid_icon_bottom_padding() const { return grid_icon_bottom_padding_; } int grid_icon_bottom_padding() const { return grid_icon_bottom_padding_; }
int grid_title_top_padding() const { return grid_title_top_padding_; } int grid_title_top_padding() const { return grid_title_top_padding_; }
int grid_title_horizontal_padding() const {
return grid_title_horizontal_padding_;
}
int grid_title_width() const { return grid_title_width_; } int grid_title_width() const { return grid_title_width_; }
int grid_focus_dimension() const { return grid_focus_dimension_; } int grid_focus_dimension() const { return grid_focus_dimension_; }
int grid_focus_corner_radius() const { return grid_focus_corner_radius_; } int grid_focus_corner_radius() const { return grid_focus_corner_radius_; }
...@@ -147,8 +150,9 @@ class ASH_PUBLIC_EXPORT AppListConfig { ...@@ -147,8 +150,9 @@ class ASH_PUBLIC_EXPORT AppListConfig {
// The icon bottom padding in tile views in apps grid view. // The icon bottom padding in tile views in apps grid view.
int grid_icon_bottom_padding_; int grid_icon_bottom_padding_;
// The title top padding in tile views in apps grid view. // The title top and horizontal padding in tile views in apps grid view.
int grid_title_top_padding_; int grid_title_top_padding_;
int grid_title_horizontal_padding_;
// The title width and color of tile views in apps grid view. // The title width and color of tile views in apps grid view.
int grid_title_width_; int grid_title_width_;
......
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