chromium/src
0
Fork 0
Code Activity

Add padding to the app icon's ripple ring only in tablet mode

Browse Source 
Bug: 1058589
Change-Id: I4b3685014e7714b42aa65640890d94fbdbd4f5a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2102639
Commit-Queue: Andrew Xu <andrewxu@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750279}
This commit is contained in:
Andrew Xu
2020-03-13 19:59:48 +00:00
committed by Commit Bot
parent 4e43a44afa
commit cf0e91f7e2
1 changed files with 4 additions and 2 deletions

6
ash/shelf/shelf_app_button.cc

@ -13,6 +13,7 @@
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_button_delegate.h"
#include "ash/shelf/shelf_view.h"
#include "ash/wm/tablet_mode/tablet_mode_controller.h"
#include "base/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
@ -542,8 +543,9 @@ gfx::Rect ShelfAppButton::CalculateSmallRippleArea() const {
const int padding = ShelfConfig::Get()->GetAppIconEndPadding();
// Add padding to the ink drop for the left-most and right-most app buttons in
// the shelf.
if (padding > 0) {
// the shelf when there is a non-zero padding between the app icon and the
// end of scrollable shelf.
if (TabletModeController::Get()->InTabletMode() && padding > 0) {
const int current_index = shelf_view_->view_model()->GetIndexOfView(this);
int left_padding =
(shelf_view_->first_visible_index() == current_index) ? padding : 0;