Commit f55b2ac4 authored by Tim Song's avatar Tim Song Committed by Commit Bot

Ash Tray: Display clear all button properly for RTL UIs.

BUG=980861

Change-Id: I1b9ac25070c20bcddda93f0c6c9e7f1fdebe1936
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1703280Reviewed-by: default avatarTetsui Ohkubo <tetsui@chromium.org>
Commit-Queue: Tim Song <tengs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678479}
parent 877c2d84
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "ash/system/unified/rounded_label_button.h" #include "ash/system/unified/rounded_label_button.h"
#include "ash/system/unified/unified_system_tray_model.h" #include "ash/system/unified/unified_system_tray_model.h"
#include "ash/system/unified/unified_system_tray_view.h" #include "ash/system/unified/unified_system_tray_view.h"
#include "base/i18n/rtl.h"
#include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/animation/linear_animation.h"
...@@ -130,9 +131,16 @@ class StackingBarClearAllButton : public views::LabelButton { ...@@ -130,9 +131,16 @@ class StackingBarClearAllButton : public views::LabelButton {
std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override { std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override {
SkScalar top_radius = SkIntToScalar(kUnifiedTrayCornerRadius); SkScalar top_radius = SkIntToScalar(kUnifiedTrayCornerRadius);
SkScalar radii[8] = {0, 0, top_radius, top_radius, 0, 0, 0, 0}; SkRect bounds = gfx::RectToSkRect(GetContentsBounds());
SkPath path; SkPath path;
path.addRoundRect(gfx::RectToSkRect(GetContentsBounds()), radii);
if (base::i18n::IsRTL()) {
SkScalar radii[8] = {top_radius, top_radius, 0, 0, 0, 0, 0, 0};
path.addRoundRect(bounds, radii);
} else {
SkScalar radii[8] = {0, 0, top_radius, top_radius, 0, 0, 0, 0};
path.addRoundRect(bounds, radii);
}
return std::make_unique<views::PathInkDropMask>(size(), path); return std::make_unique<views::PathInkDropMask>(size(), path);
} }
......
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