Migrate views::Border factory methods to ColorVariant
Bug: b:400775304 Change-Id: Iebba6631fed1d2b1a6568765ff5f6a2c8e3a029e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6341495 Reviewed-by: Elly FJ <ellyjones@chromium.org> Commit-Queue: Zoraiz Naeem <zoraiznaeem@chromium.org> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Cr-Commit-Position: refs/heads/main@{#1431685}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
2e8003b739
commit
767d503007
ash
game_dashboard
login
shelf
system
focus_mode
holding_space
time
unified
wm
overview
chrome/browser
ash
arc
input_overlay
ui
ash
input_method
views
autofill
bookmarks
desktop_capture
global_media_controls
mahi
media_preview
performance_controls
web_apps
ui/views
@ -245,7 +245,7 @@ GameDashboardToolbarView::GameDashboardToolbarView(
|
||||
SetCrossAxisAlignment(views::BoxLayout::CrossAxisAlignment::kCenter);
|
||||
SetBackground(views::CreateRoundedRectBackground(
|
||||
cros_tokens::kCrosSysSystemBaseElevatedOpaque, kCornerRadius));
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
SetBorder(views::CreateRoundedRectBorder(
|
||||
1, kCornerRadius, ui::ColorIds::kColorCrosSystemHighlightBorder));
|
||||
shadow_ = SystemShadow::CreateShadowOnNinePatchLayerForView(
|
||||
this, SystemShadow::Type::kElevation12);
|
||||
|
@ -63,7 +63,7 @@ GameDashboardWelcomeDialog::GameDashboardWelcomeDialog() {
|
||||
gfx::Insets::VH(kPrimaryLayoutInsideBorder, kPrimaryLayoutInsideBorder));
|
||||
SetBackground(views::CreateRoundedRectBackground(
|
||||
cros_tokens::kCrosSysSystemBaseElevatedOpaque, kDialogCornerRadius));
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
SetBorder(views::CreateRoundedRectBorder(
|
||||
game_dashboard::kWelcomeDialogBorderThickness, kDialogCornerRadius,
|
||||
ui::ColorIds::kColorHighlightBorderHighlight1));
|
||||
shadow_ = SystemShadow::CreateShadowOnNinePatchLayerForView(
|
||||
|
@ -259,7 +259,7 @@ FixedLengthCodeInput::FixedLengthCodeInput(int length,
|
||||
field->SetFontList(views::Textfield::GetDefaultFontList().Derive(
|
||||
kAccessCodeFontSizeDeltaDp, gfx::Font::FontStyle::NORMAL,
|
||||
gfx::Font::Weight::NORMAL));
|
||||
field->SetBorder(views::CreateThemedSolidSidedBorder(
|
||||
field->SetBorder(views::CreateSolidSidedBorder(
|
||||
gfx::Insets::TLBR(0, 0, kAccessCodeInputFieldUnderlineThicknessDp, 0),
|
||||
text_color_id));
|
||||
field->SetGroup(kFixedLengthInputGroup);
|
||||
@ -344,7 +344,7 @@ void FixedLengthCodeInput::SetInputColorId(ui::ColorId color_id) {
|
||||
field->SetTextColorId(color_id);
|
||||
// We don't update the underline color to red.
|
||||
if (color_id != error_color_id) {
|
||||
field->SetBorder(views::CreateThemedSolidSidedBorder(
|
||||
field->SetBorder(views::CreateSolidSidedBorder(
|
||||
gfx::Insets::TLBR(0, 0, kAccessCodeInputFieldUnderlineThicknessDp, 0),
|
||||
color_id));
|
||||
}
|
||||
@ -531,7 +531,7 @@ void FixedLengthCodeInput::SetReadOnly(bool read_only) {
|
||||
for (ash::AccessibleInputField* field : input_fields_) {
|
||||
field->SetReadOnly(read_only);
|
||||
field->SetBackground(nullptr);
|
||||
field->SetBorder(views::CreateThemedSolidSidedBorder(
|
||||
field->SetBorder(views::CreateSolidSidedBorder(
|
||||
gfx::Insets::TLBR(0, 0, kAccessCodeInputFieldUnderlineThicknessDp, 0),
|
||||
underline_color_id));
|
||||
field->SetCursorEnabled(!read_only);
|
||||
|
@ -77,9 +77,9 @@ LoginShelfButton::LoginShelfButton(PressedCallback callback,
|
||||
SetFocusPainter(nullptr);
|
||||
|
||||
views::InkDrop::Get(this)->SetMode(views::InkDropHost::InkDropMode::OFF);
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
kButtonHighlightWidthDp, kButtonHighlightRadiusDp,
|
||||
ui::kColorCrosSystemHighlight));
|
||||
SetBorder(views::CreateRoundedRectBorder(kButtonHighlightWidthDp,
|
||||
kButtonHighlightRadiusDp,
|
||||
ui::kColorCrosSystemHighlight));
|
||||
// PillButton has some custom tooltip logic that runs, but we don't want here.
|
||||
SetUseLabelAsDefaultTooltip(false);
|
||||
UpdateTooltipText(label());
|
||||
|
@ -251,7 +251,7 @@ LoginShelfView::LoginShelfView() {
|
||||
ButtonId id) -> LoginShelfButton* {
|
||||
View* button_container = AddChildView(std::make_unique<View>());
|
||||
button_container->SetLayoutManager(std::make_unique<views::FillLayout>());
|
||||
button_container->SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
button_container->SetBorder(views::CreateRoundedRectBorder(
|
||||
kButtonHighlightBorderWidth, kButtonHighlightBorderRadius,
|
||||
ui::kColorCrosSystemHighlightBorder));
|
||||
button_container->SetID(kButtonContainerDiff + id);
|
||||
|
@ -49,8 +49,8 @@ constexpr int kFirstChipOffsetX =
|
||||
void SetupChip(views::LabelButton* chip, bool first) {
|
||||
chip->SetHorizontalAlignment(gfx::ALIGN_CENTER);
|
||||
chip->SetBorder(views::CreatePaddedBorder(
|
||||
views::CreateThemedRoundedRectBorder(1, kChipHeight,
|
||||
cros_tokens::kCrosSysSeparator),
|
||||
views::CreateRoundedRectBorder(1, kChipHeight,
|
||||
cros_tokens::kCrosSysSeparator),
|
||||
kChipInsets));
|
||||
// Add a border to space out chips on all chips but the first.
|
||||
chip->SetProperty(views::kMarginsKey,
|
||||
|
@ -124,7 +124,7 @@ HoldingSpaceItemScreenCaptureView::HoldingSpaceItemScreenCaptureView(
|
||||
kColorAshShieldAndBase80))))
|
||||
.AddChild(views::Builder<views::View>()
|
||||
.SetCanProcessEventsWithinSubtree(false)
|
||||
.SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
.SetBorder(views::CreateRoundedRectBorder(
|
||||
kBorderThickness, kHoldingSpaceCornerRadius,
|
||||
kColorAshSeparatorColor)))
|
||||
.BuildChildren();
|
||||
|
@ -80,9 +80,9 @@ class CalendarEmptyEventListView : public PillButton {
|
||||
controller_(controller) {
|
||||
SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_CENTER);
|
||||
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
kOpenGoogleCalendarBorderThickness, GetPreferredSize().height() / 2,
|
||||
kColorAshHairlineBorderColor));
|
||||
SetBorder(views::CreateRoundedRectBorder(kOpenGoogleCalendarBorderThickness,
|
||||
GetPreferredSize().height() / 2,
|
||||
kColorAshHairlineBorderColor));
|
||||
SetTooltipText(
|
||||
l10n_util::GetStringUTF16(IDS_ASH_CALENDAR_NO_EVENT_BUTTON_TOOL_TIP));
|
||||
}
|
||||
|
@ -103,7 +103,7 @@ class Separator : public views::View {
|
||||
views::Builder<views::View>()
|
||||
// make sure that the view is displayed by setting non-zero size
|
||||
.SetPreferredSize(gfx::Size(1, 1))
|
||||
.SetBorder(views::CreateThemedSolidSidedBorder(
|
||||
.SetBorder(views::CreateSolidSidedBorder(
|
||||
gfx::Insets::TLBR(0, 0, kUnifiedNotificationSeparatorThickness,
|
||||
0),
|
||||
cros_tokens::kCrosSysSeparator))
|
||||
|
@ -190,7 +190,7 @@ std::unique_ptr<views::ImageView> CreateSecondaryImageView(
|
||||
.SetSize(gfx::Size(kSecondaryIconViewSize, kSecondaryIconViewSize))
|
||||
.SetBackground(views::CreateRoundedRectBackground(
|
||||
kSecondaryIconBackgroundColorId, kSecondaryIconViewSize / 2))
|
||||
.SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
.SetBorder(views::CreateRoundedRectBorder(
|
||||
1, kSecondaryIconViewSize / 2,
|
||||
cros_tokens::kCrosSysSystemOnBaseOpaque))
|
||||
.Build();
|
||||
|
@ -41,7 +41,7 @@ class OverviewDropTargetView : public views::View {
|
||||
background_view_->SetBackground(views::CreateRoundedRectBackground(
|
||||
kColorAshShieldAndBase20, corner_radius));
|
||||
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
SetBorder(views::CreateRoundedRectBorder(
|
||||
kDropTargetBorderThickness, corner_radius,
|
||||
cros_tokens::kCrosSysSystemBaseElevated));
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ ActionTypeButton::ActionTypeButton(PressedCallback callback,
|
||||
SetVisible(true);
|
||||
SetBackground(views::CreateRoundedRectBackground(SK_ColorTRANSPARENT,
|
||||
/*radius=*/kCornerRadius));
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
SetBorder(views::CreateRoundedRectBorder(
|
||||
/*thickness=*/kBorderThickness,
|
||||
/*radius=*/kCornerRadius, cros_tokens::kCrosSysHoverOnSubtle));
|
||||
SetFocusBehavior(views::View::FocusBehavior::ACCESSIBLE_ONLY);
|
||||
@ -89,7 +89,7 @@ void ActionTypeButton::RefreshColors() {
|
||||
/*radius=*/kCornerRadius));
|
||||
SetBorder(is_selected
|
||||
? views::CreateEmptyBorder(/*thickness=*/kBorderThickness)
|
||||
: views::CreateThemedRoundedRectBorder(
|
||||
: views::CreateRoundedRectBorder(
|
||||
/*thickness=*/kBorderThickness,
|
||||
/*radius=*/kCornerRadius,
|
||||
cros_tokens::kCrosSysHoverOnSubtle));
|
||||
|
@ -265,7 +265,7 @@ void EditLabel::SetToFocused() {
|
||||
SetEnabledTextColors(IsInputUnbound() && !action_->is_new()
|
||||
? cros_tokens::kCrosSysError
|
||||
: cros_tokens::kCrosSysOnSurface);
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
SetBorder(views::CreateRoundedRectBorder(
|
||||
/*thickness=*/2, kCornerRadius, cros_tokens::kCrosSysPrimary));
|
||||
}
|
||||
|
||||
|
@ -204,8 +204,7 @@ void CandidateView::SetHighlighted(bool highlighted) {
|
||||
if (highlighted) {
|
||||
SetBackground(
|
||||
views::CreateSolidBackground(ui::kColorTextfieldSelectionBackground));
|
||||
SetBorder(
|
||||
views::CreateThemedSolidBorder(1, ui::kColorFocusableBorderFocused));
|
||||
SetBorder(views::CreateSolidBorder(1, ui::kColorFocusableBorderFocused));
|
||||
|
||||
// Cancel currently focused one.
|
||||
for (View* view : parent()->children()) {
|
||||
|
@ -22,10 +22,10 @@ BnplLinkedIssuerPill::BnplLinkedIssuerPill()
|
||||
views::style::CONTEXT_DIALOG_BODY_TEXT,
|
||||
views::style::STYLE_SECONDARY) {
|
||||
// TODO(kylixrd): Find appropriate metrics on ChromeLayoutProvider.
|
||||
SetBackground(views::CreateRoundedRectBackground(
|
||||
ui::ColorVariant(ui::kColorBadgeBackground), gfx::RoundedCornersF(8)));
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
0, 8, gfx::Insets::TLBR(0, 4, 0, 4), ui::kColorBadgeBackground));
|
||||
SetBackground(views::CreateRoundedRectBackground(ui::kColorBadgeBackground,
|
||||
gfx::RoundedCornersF(8)));
|
||||
SetBorder(views::CreateRoundedRectBorder(0, 8, gfx::Insets::TLBR(0, 4, 0, 4),
|
||||
ui::kColorBadgeBackground));
|
||||
}
|
||||
|
||||
BnplLinkedIssuerPill::~BnplLinkedIssuerPill() = default;
|
||||
|
@ -107,8 +107,8 @@ std::unique_ptr<views::BoxLayoutView> CreateTipTextContainer(
|
||||
.SetBetweenChildSpacing(kContainerChildSpace)
|
||||
.SetBackground(
|
||||
views::CreateSolidBackground(kColorPaymentsFeedbackTipBackground))
|
||||
.SetBorder(views::CreateThemedSolidBorder(
|
||||
kTipValuePromptBorderThickness, kColorPaymentsFeedbackTipBorder))
|
||||
.SetBorder(views::CreateSolidBorder(kTipValuePromptBorderThickness,
|
||||
kColorPaymentsFeedbackTipBorder))
|
||||
.Build();
|
||||
|
||||
container->AddChildView(
|
||||
|
@ -373,7 +373,7 @@ class BookmarkBarView::ButtonSeparatorView : public views::Separator {
|
||||
border_insets.left() + separator_thickness_ + border_insets.right(),
|
||||
gfx::kFaviconSize));
|
||||
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
SetBorder(views::CreateRoundedRectBorder(
|
||||
separator_thickness_ / 2, separator_thickness_ / 2, border_insets,
|
||||
kColorBookmarkBarSeparatorChromeRefresh));
|
||||
}
|
||||
|
@ -243,10 +243,9 @@ void SavedTabGroupButton::UpdateButtonLayout() {
|
||||
if (!local_group_id_.has_value()) {
|
||||
SetBorder(views::CreateEmptyBorder(insets));
|
||||
} else {
|
||||
std::unique_ptr<views::Border> border =
|
||||
views::CreateThemedRoundedRectBorder(
|
||||
kBorderThickness, kButtonRadius,
|
||||
GetSavedTabGroupOutlineColorId(tab_group_color_id_));
|
||||
std::unique_ptr<views::Border> border = views::CreateRoundedRectBorder(
|
||||
kBorderThickness, kButtonRadius,
|
||||
GetSavedTabGroupOutlineColorId(tab_group_color_id_));
|
||||
SetBorder(views::CreatePaddedBorder(std::move(border), insets));
|
||||
}
|
||||
|
||||
|
@ -193,8 +193,8 @@ ShareThisTabDialogView::ShareThisTabDialogView(
|
||||
CreateDialogWidget(this, params.context, nullptr)->Show();
|
||||
}
|
||||
|
||||
source_view_->SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
1, 4, ui::kColorSysPrimaryContainer));
|
||||
source_view_->SetBorder(
|
||||
views::CreateRoundedRectBorder(1, 4, ui::kColorSysPrimaryContainer));
|
||||
|
||||
SetButtonLabel(ui::mojom::DialogButton::kOk,
|
||||
l10n_util::GetStringUTF16(IDS_SHARE_THIS_TAB_DIALOG_ALLOW));
|
||||
|
@ -33,7 +33,7 @@ CastDeviceFooterView::CastDeviceFooterView(
|
||||
base::RepeatingClosure stop_casting_callback,
|
||||
media_message_center::MediaColorTheme media_color_theme)
|
||||
: stop_casting_callback_(std::move(stop_casting_callback)) {
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
SetBorder(views::CreateRoundedRectBorder(
|
||||
kBackgroundBorderThickness, kBackgroundCornerRadius,
|
||||
media_color_theme.device_selector_border_color_id));
|
||||
SetBackground(views::CreateRoundedRectBackground(
|
||||
|
@ -118,7 +118,7 @@ CastDeviceSelectorView::CastDeviceSelectorView(
|
||||
: device_list_host_(std::move(device_list_host)),
|
||||
device_list_client_(this, std::move(device_list_client)),
|
||||
media_color_theme_(media_color_theme) {
|
||||
SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
SetBorder(views::CreateRoundedRectBorder(
|
||||
kBackgroundBorderThickness, kBackgroundCornerRadius,
|
||||
media_color_theme_.device_selector_border_color_id));
|
||||
SetBackground(views::CreateRoundedRectBackground(
|
||||
|
@ -106,8 +106,8 @@ void StyleMenuButton(views::LabelButton* button, const gfx::VectorIcon& icon) {
|
||||
auto color_id = button->GetEnabled() ? ui::kColorSysTonalOutline
|
||||
: ui::kColorButtonBorderDisabled;
|
||||
button->SetBorder(views::CreatePaddedBorder(
|
||||
views::CreateThemedRoundedRectBorder(kButtonBorderThickness,
|
||||
kButtonCornerRadius, color_id),
|
||||
views::CreateRoundedRectBorder(kButtonBorderThickness,
|
||||
kButtonCornerRadius, color_id),
|
||||
kButtonPadding));
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,7 @@ std::unique_ptr<views::View> CreatePreviewBadge() {
|
||||
const int kBorderThickness = 0;
|
||||
const int kRoundedRadius =
|
||||
GetLayoutConstant(LOCATION_BAR_CHILD_CORNER_RADIUS);
|
||||
badge_view->SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
badge_view->SetBorder(views::CreateRoundedRectBorder(
|
||||
kBorderThickness, kRoundedRadius,
|
||||
gfx::Insets::TLBR(kVerticalInset, kLeftInset, kVerticalInset,
|
||||
kRightInset),
|
||||
|
@ -46,7 +46,7 @@ MediaCoordinator::MediaCoordinator(
|
||||
const int kBorderThickness =
|
||||
provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
|
||||
|
||||
media_view_->SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
media_view_->SetBorder(views::CreateRoundedRectBorder(
|
||||
kBorderThickness, kRoundedRadius, ui::kColorSysSurface4));
|
||||
media_view_->SetBackground(views::CreateRoundedRectBackground(
|
||||
ui::kColorSysSurface4, kRoundedRadius));
|
||||
|
@ -61,7 +61,7 @@ MediaViewControllerBase::MediaViewControllerBase(
|
||||
const int kBorderThickness =
|
||||
provider->GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL);
|
||||
|
||||
base_view_->SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
base_view_->SetBorder(views::CreateRoundedRectBorder(
|
||||
kBorderThickness, kRoundedRadius, ui::kColorMenuBackground));
|
||||
base_view_->SetBackground(views::CreateRoundedRectBackground(
|
||||
ui::kColorMenuBackground, kRoundedRadius));
|
||||
|
@ -179,7 +179,7 @@ TabListRowView::TabListRowView(
|
||||
|
||||
favicon->SetBackground(views::CreateRoundedRectBackground(
|
||||
ui::kColorSysNeutralContainer, kFaviconCornerRadius));
|
||||
favicon->SetBorder(views::CreateThemedRoundedRectBorder(
|
||||
favicon->SetBorder(views::CreateRoundedRectBorder(
|
||||
kFaviconBorderThickness, kFaviconCornerRadius,
|
||||
ui::kColorSysNeutralContainer));
|
||||
|
||||
|
@ -213,7 +213,7 @@ class ImageCarouselView : public views::View {
|
||||
throbber->Start();
|
||||
|
||||
throbber_container_view->AddChildView(std::move(throbber));
|
||||
throbber_container_view->SetBorder(views::CreateThemedSolidBorder(
|
||||
throbber_container_view->SetBorder(views::CreateSolidBorder(
|
||||
/*thickness=*/1, ui::kColorSysSecondaryContainer));
|
||||
throbber_container_view->SetProperty(
|
||||
views::kMarginsKey, gfx::Insets::TLBR(0, 0, 0, image_padding_));
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "cc/paint/paint_flags.h"
|
||||
#include "ui/color/color_provider.h"
|
||||
#include "ui/color/color_variant.h"
|
||||
#include "ui/compositor/layer.h"
|
||||
#include "ui/gfx/canvas.h"
|
||||
#include "ui/gfx/geometry/dip_util.h"
|
||||
@ -294,14 +295,15 @@ std::unique_ptr<Border> NullBorder() {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
std::unique_ptr<Border> CreateSolidBorder(int thickness, SkColor color) {
|
||||
return std::make_unique<SolidSidedBorder>(gfx::Insets(thickness), color);
|
||||
}
|
||||
std::unique_ptr<Border> CreateSolidBorder(int thickness,
|
||||
ui::ColorVariant color) {
|
||||
if (auto color_id = color.GetColorId()) {
|
||||
return std::make_unique<ThemedSolidSidedBorder>(gfx::Insets(thickness),
|
||||
*color_id);
|
||||
}
|
||||
|
||||
std::unique_ptr<Border> CreateThemedSolidBorder(int thickness,
|
||||
ui::ColorId color) {
|
||||
return std::make_unique<ThemedSolidSidedBorder>(gfx::Insets(thickness),
|
||||
color);
|
||||
return std::make_unique<SolidSidedBorder>(gfx::Insets(thickness),
|
||||
*color.GetSkColor());
|
||||
}
|
||||
|
||||
std::unique_ptr<Border> CreateEmptyBorder(const gfx::Insets& insets) {
|
||||
@ -314,7 +316,7 @@ std::unique_ptr<Border> CreateEmptyBorder(int thickness) {
|
||||
|
||||
std::unique_ptr<Border> CreateRoundedRectBorder(int thickness,
|
||||
float corner_radius,
|
||||
SkColor color) {
|
||||
ui::ColorVariant color) {
|
||||
return CreateRoundedRectBorder(thickness, corner_radius, gfx::Insets(),
|
||||
color);
|
||||
}
|
||||
@ -322,35 +324,23 @@ std::unique_ptr<Border> CreateRoundedRectBorder(int thickness,
|
||||
std::unique_ptr<Border> CreateRoundedRectBorder(int thickness,
|
||||
float corner_radius,
|
||||
const gfx::Insets& paint_insets,
|
||||
SkColor color) {
|
||||
ui::ColorVariant color) {
|
||||
if (auto color_id = color.GetColorId()) {
|
||||
return std::make_unique<ThemedRoundedRectBorder>(thickness, corner_radius,
|
||||
paint_insets, *color_id);
|
||||
}
|
||||
|
||||
return std::make_unique<RoundedRectBorder>(thickness, corner_radius,
|
||||
paint_insets, color);
|
||||
}
|
||||
|
||||
std::unique_ptr<Border> CreateThemedRoundedRectBorder(int thickness,
|
||||
float corner_radius,
|
||||
ui::ColorId color_id) {
|
||||
return CreateThemedRoundedRectBorder(thickness, corner_radius, gfx::Insets(),
|
||||
color_id);
|
||||
}
|
||||
|
||||
std::unique_ptr<Border> CreateThemedRoundedRectBorder(
|
||||
int thickness,
|
||||
float corner_radius,
|
||||
const gfx::Insets& paint_insets,
|
||||
ui::ColorId color_id) {
|
||||
return std::make_unique<ThemedRoundedRectBorder>(thickness, corner_radius,
|
||||
paint_insets, color_id);
|
||||
paint_insets, *color.GetSkColor());
|
||||
}
|
||||
|
||||
std::unique_ptr<Border> CreateSolidSidedBorder(const gfx::Insets& insets,
|
||||
SkColor color) {
|
||||
return std::make_unique<SolidSidedBorder>(insets, color);
|
||||
}
|
||||
ui::ColorVariant color) {
|
||||
if (auto color_id = color.GetColorId()) {
|
||||
return std::make_unique<ThemedSolidSidedBorder>(insets, *color_id);
|
||||
}
|
||||
|
||||
std::unique_ptr<Border> CreateThemedSolidSidedBorder(const gfx::Insets& insets,
|
||||
ui::ColorId color_id) {
|
||||
return std::make_unique<ThemedSolidSidedBorder>(insets, color_id);
|
||||
return std::make_unique<SolidSidedBorder>(insets, *color.GetSkColor());
|
||||
}
|
||||
|
||||
std::unique_ptr<Border> CreatePaddedBorder(std::unique_ptr<Border> border,
|
||||
@ -360,7 +350,7 @@ std::unique_ptr<Border> CreatePaddedBorder(std::unique_ptr<Border> border,
|
||||
|
||||
std::unique_ptr<Border> CreateBorderPainter(std::unique_ptr<Painter> painter,
|
||||
const gfx::Insets& insets) {
|
||||
return base::WrapUnique(new BorderPainter(std::move(painter), insets));
|
||||
return std::make_unique<BorderPainter>(std::move(painter), insets);
|
||||
}
|
||||
|
||||
} // namespace views
|
||||
|
@ -9,6 +9,7 @@
|
||||
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
#include "ui/color/color_id.h"
|
||||
#include "ui/color/color_variant.h"
|
||||
#include "ui/gfx/color_palette.h"
|
||||
#include "ui/gfx/geometry/insets.h"
|
||||
#include "ui/views/views_export.h"
|
||||
@ -84,34 +85,21 @@ VIEWS_EXPORT std::unique_ptr<Border> NullBorder();
|
||||
|
||||
// Creates a border that is a simple line of the specified thickness and color.
|
||||
VIEWS_EXPORT std::unique_ptr<Border> CreateSolidBorder(int thickness,
|
||||
SkColor color);
|
||||
|
||||
// Creates a border that is a simple line of the specified thickness and color,
|
||||
// which updates on theme changes.
|
||||
VIEWS_EXPORT std::unique_ptr<Border> CreateThemedSolidBorder(int thickness,
|
||||
ui::ColorId color);
|
||||
ui::ColorVariant color);
|
||||
|
||||
// Creates a border that is a rounded rectangle of the specified thickness and
|
||||
// color.
|
||||
// NOTE: `corner_radius` is an OUTER EDGE RADIUS, not a stroke radius!
|
||||
VIEWS_EXPORT std::unique_ptr<Border>
|
||||
CreateRoundedRectBorder(int thickness, float corner_radius, SkColor color);
|
||||
VIEWS_EXPORT std::unique_ptr<Border> CreateRoundedRectBorder(
|
||||
int thickness,
|
||||
float corner_radius,
|
||||
ui::ColorVariant color);
|
||||
|
||||
VIEWS_EXPORT std::unique_ptr<Border> CreateRoundedRectBorder(
|
||||
int thickness,
|
||||
float corner_radius,
|
||||
const gfx::Insets& paint_insets,
|
||||
SkColor color);
|
||||
|
||||
// Same as above except the color updates with theme changes.
|
||||
VIEWS_EXPORT std::unique_ptr<Border> CreateThemedRoundedRectBorder(
|
||||
int thickness,
|
||||
float corner_radius,
|
||||
ui::ColorId color_id);
|
||||
VIEWS_EXPORT std::unique_ptr<Border> CreateThemedRoundedRectBorder(
|
||||
int thickness,
|
||||
float corner_radius,
|
||||
const gfx::Insets& paint_insets,
|
||||
ui::ColorId color_id);
|
||||
ui::ColorVariant color);
|
||||
|
||||
// Creates a border for reserving space. The returned border does not paint
|
||||
// anything.
|
||||
@ -125,13 +113,7 @@ VIEWS_EXPORT std::unique_ptr<Border> CreateEmptyBorder(int thickness);
|
||||
// in |insets|.
|
||||
VIEWS_EXPORT std::unique_ptr<Border> CreateSolidSidedBorder(
|
||||
const gfx::Insets& insets,
|
||||
SkColor color);
|
||||
|
||||
// Creates a border of the specified color with thickness on each side specified
|
||||
// in |insets|. The border updates on theme changes.
|
||||
VIEWS_EXPORT std::unique_ptr<Border> CreateThemedSolidSidedBorder(
|
||||
const gfx::Insets& insets,
|
||||
ui::ColorId color_id);
|
||||
ui::ColorVariant color);
|
||||
|
||||
// Creates a new border that draws |border| and adds additional padding. This is
|
||||
// equivalent to changing the insets of |border| without changing how or what it
|
||||
|
@ -420,8 +420,8 @@ class SelectedColorPatchView : public views::View {
|
||||
|
||||
SelectedColorPatchView::SelectedColorPatchView() {
|
||||
SetVisible(true);
|
||||
SetBorder(CreateThemedSolidBorder(kBorderWidth,
|
||||
ui::kColorFocusableBorderUnfocused));
|
||||
SetBorder(
|
||||
CreateSolidBorder(kBorderWidth, ui::kColorFocusableBorderUnfocused));
|
||||
}
|
||||
|
||||
void SelectedColorPatchView::SetColor(SkColor color) {
|
||||
|
@ -570,7 +570,7 @@ void Combobox::UpdateBorder() {
|
||||
SetBorder(nullptr);
|
||||
return;
|
||||
}
|
||||
SetBorder(CreateThemedRoundedRectBorder(
|
||||
SetBorder(CreateRoundedRectBorder(
|
||||
kBorderThickness, GetCornerRadius(),
|
||||
invalid_
|
||||
? ui::kColorAlertHighSeverity
|
||||
|
@ -439,8 +439,7 @@ void MenuScrollViewContainer::CreateDefaultBorder() {
|
||||
// When a custom background color is used, ensure that the border uses
|
||||
// the custom background color for its insets.
|
||||
if (border_color_id_.has_value()) {
|
||||
SetBorder(
|
||||
views::CreateThemedSolidSidedBorder(insets, border_color_id_.value()));
|
||||
SetBorder(views::CreateSolidSidedBorder(insets, border_color_id_.value()));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -34,8 +34,8 @@ TooltipViewAura::TooltipViewAura()
|
||||
|
||||
SetBackground(views::CreateSolidBackground(ui::kColorTooltipBackground));
|
||||
SetBorder(views::CreatePaddedBorder(
|
||||
views::CreateThemedSolidBorder(kTooltipBorderThickness,
|
||||
ui::kColorTooltipForeground),
|
||||
views::CreateSolidBorder(kTooltipBorderThickness,
|
||||
ui::kColorTooltipForeground),
|
||||
kBorderInset - gfx::Insets(kTooltipBorderThickness)));
|
||||
|
||||
GetViewAccessibility().SetRole(ax::mojom::Role::kTooltip);
|
||||
|
@ -267,7 +267,7 @@ void ActionsExample::CreateExampleView(View* container) {
|
||||
Builder<View>()
|
||||
.CopyAddressTo(&action_panel_)
|
||||
.SetLayoutManager(std::make_unique<FlowLayout>())
|
||||
.SetBorder(CreateThemedSolidBorder(
|
||||
.SetBorder(CreateSolidBorder(
|
||||
1, ui::kColorFocusableBorderUnfocused)),
|
||||
Builder<BoxLayoutView>()
|
||||
.CopyAddressTo(&control_panel_)
|
||||
|
@ -64,7 +64,7 @@ class AnimationGallery : public BoxLayoutView, public TextfieldController {
|
||||
.AddChild(
|
||||
Builder<AnimatedImageView>()
|
||||
.CopyAddressTo(&animated_image_view_)
|
||||
.SetBorder(CreateThemedSolidBorder(
|
||||
.SetBorder(CreateSolidBorder(
|
||||
1, ExamplesColorIds::
|
||||
kColorAnimatedImageViewExampleBorder))),
|
||||
Builder<BoxLayoutView>()
|
||||
|
@ -61,7 +61,7 @@ FadingView::FadingView() {
|
||||
.AddChildren(
|
||||
Builder<BoxLayoutView>()
|
||||
.CopyAddressTo(&primary_view_)
|
||||
.SetBorder(CreateThemedRoundedRectBorder(
|
||||
.SetBorder(CreateRoundedRectBorder(
|
||||
1, kCornerRadius,
|
||||
ExamplesColorIds::kColorFadeAnimationExampleBorder))
|
||||
.SetBackground(CreateRoundedRectBackground(
|
||||
@ -83,7 +83,7 @@ FadingView::FadingView() {
|
||||
.SetVerticalAlignment(gfx::ALIGN_MIDDLE)),
|
||||
Builder<BoxLayoutView>()
|
||||
.CopyAddressTo(&secondary_view_)
|
||||
.SetBorder(CreateThemedRoundedRectBorder(
|
||||
.SetBorder(CreateRoundedRectBorder(
|
||||
1, kCornerRadius,
|
||||
ExamplesColorIds::kColorFadeAnimationExampleBorder))
|
||||
.SetBackground(CreateRoundedRectBackground(
|
||||
|
@ -82,7 +82,7 @@ void InkDropExample::CreateExampleView(View* container) {
|
||||
.AddChildren(
|
||||
Builder<InkDropView>()
|
||||
.CopyAddressTo(&ink_drop_view_)
|
||||
.SetBorder(CreateThemedRoundedRectBorder(
|
||||
.SetBorder(CreateRoundedRectBorder(
|
||||
1, 4, ExamplesColorIds::kColorInkDropExampleBorder))
|
||||
.SetProperty(kMarginsKey, gfx::Insets(10)),
|
||||
Builder<BoxLayoutView>()
|
||||
|
@ -44,8 +44,7 @@ class ExamplePreferredSizeLabel : public Label {
|
||||
|
||||
public:
|
||||
ExamplePreferredSizeLabel() {
|
||||
SetBorder(
|
||||
CreateThemedSolidBorder(1, ExamplesColorIds::kColorLabelExampleBorder));
|
||||
SetBorder(CreateSolidBorder(1, ExamplesColorIds::kColorLabelExampleBorder));
|
||||
}
|
||||
|
||||
ExamplePreferredSizeLabel(const ExamplePreferredSizeLabel&) = delete;
|
||||
@ -128,8 +127,8 @@ void LabelExample::CreateExampleView(View* container) {
|
||||
container->AddChildView(std::move(label));
|
||||
|
||||
label = std::make_unique<Label>(u"Label with thick border");
|
||||
label->SetBorder(CreateThemedSolidBorder(
|
||||
20, ExamplesColorIds::kColorLabelExampleThickBorder));
|
||||
label->SetBorder(
|
||||
CreateSolidBorder(20, ExamplesColorIds::kColorLabelExampleThickBorder));
|
||||
container->AddChildView(std::move(label));
|
||||
|
||||
label = std::make_unique<Label>(
|
||||
@ -172,8 +171,8 @@ void LabelExample::ContentsChanged(Textfield* sender,
|
||||
|
||||
void LabelExample::AddCustomLabel(View* container) {
|
||||
std::unique_ptr<View> control_container = std::make_unique<View>();
|
||||
control_container->SetBorder(CreateThemedSolidBorder(
|
||||
2, ExamplesColorIds::kColorLabelExampleCustomBorder));
|
||||
control_container->SetBorder(
|
||||
CreateSolidBorder(2, ExamplesColorIds::kColorLabelExampleCustomBorder));
|
||||
control_container->SetBackground(CreateSolidBackground(
|
||||
ExamplesColorIds::kColorLabelExampleCustomBackground));
|
||||
control_container->SetLayoutManager(
|
||||
|
@ -238,7 +238,7 @@ void MenuExample::CreateExampleView(View* container) {
|
||||
.Build();
|
||||
|
||||
example_menu_button->SetBorder(CreatePaddedBorder(
|
||||
CreateThemedRoundedRectBorder(1, 5, kColorMenuButtonExampleBorder),
|
||||
CreateRoundedRectBorder(1, 5, kColorMenuButtonExampleBorder),
|
||||
LayoutProvider::Get()->GetInsetsMetric(
|
||||
InsetsMetric::INSETS_LABEL_BUTTON)));
|
||||
|
||||
|
@ -75,8 +75,8 @@ class MultilineExample::RenderTextView : public View {
|
||||
RenderTextView() : render_text_(gfx::RenderText::CreateRenderText()) {
|
||||
render_text_->SetHorizontalAlignment(gfx::ALIGN_TO_HEAD);
|
||||
render_text_->SetMultiline(true);
|
||||
SetBorder(CreateThemedSolidBorder(
|
||||
2, ExamplesColorIds::kColorMultilineExampleBorder));
|
||||
SetBorder(
|
||||
CreateSolidBorder(2, ExamplesColorIds::kColorMultilineExampleBorder));
|
||||
}
|
||||
|
||||
RenderTextView(const RenderTextView&) = delete;
|
||||
@ -205,7 +205,7 @@ void MultilineExample::CreateExampleView(View* container) {
|
||||
label_ = container->AddChildView(std::make_unique<PreferredSizeLabel>());
|
||||
label_->SetText(kTestString);
|
||||
label_->SetMultiLine(true);
|
||||
label_->SetBorder(CreateThemedSolidBorder(
|
||||
label_->SetBorder(CreateSolidBorder(
|
||||
2, ExamplesColorIds::kColorMultilineExampleLabelBorder));
|
||||
|
||||
elision_checkbox_ = container->AddChildView(std::make_unique<Checkbox>(
|
||||
|
@ -175,8 +175,8 @@ class VectorIconGallery : public View, public TextfieldController {
|
||||
image_view_container_->RemoveAllChildViews();
|
||||
image_view_ =
|
||||
image_view_container_->AddChildView(std::make_unique<ImageView>());
|
||||
image_view_->SetBorder(CreateThemedSolidBorder(
|
||||
1, ExamplesColorIds::kColorVectorExampleImageBorder));
|
||||
image_view_->SetBorder(
|
||||
CreateSolidBorder(1, ExamplesColorIds::kColorVectorExampleImageBorder));
|
||||
|
||||
auto image_layout =
|
||||
std::make_unique<BoxLayout>(BoxLayout::Orientation::kHorizontal);
|
||||
|
Reference in New Issue
Block a user