[ChromeOS] Add separate copies of top_left and top_right icons
This is to address the suggestion in https://chromium-review.googlesource.com/c/chromium/src/+/6363243 Bug: b:400842133 Change-Id: Ic73dd9cb5e315c2d38db02ab916e167b1025d979 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6372795 Reviewed-by: James Cook <jamescook@chromium.org> Commit-Queue: Luke Cao <caott@google.com> Cr-Commit-Position: refs/heads/main@{#1435580}
This commit is contained in:
ash
boca
on_task
resources
@@ -69,7 +69,7 @@ class PinTabStripButton : public views::LabelButton {
|
|||||||
: views::LabelButton(std::move(callback), text) {
|
: views::LabelButton(std::move(callback), text) {
|
||||||
SetImageModel(views::Button::STATE_NORMAL,
|
SetImageModel(views::Button::STATE_NORMAL,
|
||||||
ui::ImageModel::FromVectorIcon(
|
ui::ImageModel::FromVectorIcon(
|
||||||
kTabsIcon, cros_tokens::kCrosSysOnSurface));
|
kOnTaskPodTabsIcon, cros_tokens::kCrosSysOnSurface));
|
||||||
// Accessing protected member label() to set the font list.
|
// Accessing protected member label() to set the font list.
|
||||||
label()->SetFontList(TypographyProvider::Get()->ResolveTypographyToken(
|
label()->SetFontList(TypographyProvider::Get()->ResolveTypographyToken(
|
||||||
TypographyToken::kCrosButton2));
|
TypographyToken::kCrosButton2));
|
||||||
@@ -122,13 +122,13 @@ void OnTaskPodView::AddShortcutButtons() {
|
|||||||
base::BindRepeating(&OnTaskPodController::SetSnapLocation,
|
base::BindRepeating(&OnTaskPodController::SetSnapLocation,
|
||||||
base::Unretained(pod_controller_),
|
base::Unretained(pod_controller_),
|
||||||
OnTaskPodSnapLocation::kTopLeft),
|
OnTaskPodSnapLocation::kTopLeft),
|
||||||
&kAutoclickPositionTopLeftIcon,
|
&kOnTaskPodPositionTopLeftIcon,
|
||||||
l10n_util::GetStringUTF16(IDS_ON_TASK_MOVE_POD_TOP_LEFT_ACCESSIBLE_NAME));
|
l10n_util::GetStringUTF16(IDS_ON_TASK_MOVE_POD_TOP_LEFT_ACCESSIBLE_NAME));
|
||||||
dock_right_button_ = pod_position_slider_->AddButton<IconSliderButton>(
|
dock_right_button_ = pod_position_slider_->AddButton<IconSliderButton>(
|
||||||
base::BindRepeating(&OnTaskPodController::SetSnapLocation,
|
base::BindRepeating(&OnTaskPodController::SetSnapLocation,
|
||||||
base::Unretained(pod_controller_),
|
base::Unretained(pod_controller_),
|
||||||
OnTaskPodSnapLocation::kTopRight),
|
OnTaskPodSnapLocation::kTopRight),
|
||||||
&kAutoclickPositionTopRightIcon,
|
&kOnTaskPodPositionTopRightIcon,
|
||||||
l10n_util::GetStringUTF16(
|
l10n_util::GetStringUTF16(
|
||||||
IDS_ON_TASK_MOVE_POD_TOP_RIGHT_ACCESSIBLE_NAME));
|
IDS_ON_TASK_MOVE_POD_TOP_RIGHT_ACCESSIBLE_NAME));
|
||||||
dock_left_button_->SetSelected(true);
|
dock_left_button_->SetSelected(true);
|
||||||
@@ -185,7 +185,7 @@ void OnTaskPodView::UpdatePinTabStripButton() {
|
|||||||
pin_tab_strip_button_->SetImageModel(
|
pin_tab_strip_button_->SetImageModel(
|
||||||
views::Button::STATE_NORMAL,
|
views::Button::STATE_NORMAL,
|
||||||
ui::ImageModel::FromVectorIcon(
|
ui::ImageModel::FromVectorIcon(
|
||||||
kTabsIcon, cros_tokens::kCrosSysSystemOnPrimaryContainer));
|
kOnTaskPodTabsIcon, cros_tokens::kCrosSysSystemOnPrimaryContainer));
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, button is "Show tabs" when the tab strip is already hidden.
|
// Otherwise, button is "Show tabs" when the tab strip is already hidden.
|
||||||
pin_tab_strip_button_->SetText(l10n_util::GetStringUTF16(
|
pin_tab_strip_button_->SetText(l10n_util::GetStringUTF16(
|
||||||
@@ -195,7 +195,7 @@ void OnTaskPodView::UpdatePinTabStripButton() {
|
|||||||
pin_tab_strip_button_->SetEnabledTextColors(cros_tokens::kCrosSysOnSurface);
|
pin_tab_strip_button_->SetEnabledTextColors(cros_tokens::kCrosSysOnSurface);
|
||||||
pin_tab_strip_button_->SetImageModel(
|
pin_tab_strip_button_->SetImageModel(
|
||||||
views::Button::STATE_NORMAL,
|
views::Button::STATE_NORMAL,
|
||||||
ui::ImageModel::FromVectorIcon(kTabsIcon,
|
ui::ImageModel::FromVectorIcon(kOnTaskPodTabsIcon,
|
||||||
cros_tokens::kCrosSysOnSurface));
|
cros_tokens::kCrosSysOnSurface));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -328,6 +328,9 @@ aggregate_vector_icons("ash_vector_icons") {
|
|||||||
"notification_stop.icon",
|
"notification_stop.icon",
|
||||||
"notification_stylus_battery_warning.icon",
|
"notification_stylus_battery_warning.icon",
|
||||||
"notification_timer.icon",
|
"notification_timer.icon",
|
||||||
|
"on_task_pod_position_top_left.icon",
|
||||||
|
"on_task_pod_position_top_right.icon",
|
||||||
|
"on_task_pod_tabs.icon",
|
||||||
"overflow_shelf_left.icon",
|
"overflow_shelf_left.icon",
|
||||||
"overflow_shelf_right.icon",
|
"overflow_shelf_right.icon",
|
||||||
"overview_refresh.icon",
|
"overview_refresh.icon",
|
||||||
@@ -593,7 +596,6 @@ aggregate_vector_icons("ash_vector_icons") {
|
|||||||
"system_tray_tracing.icon",
|
"system_tray_tracing.icon",
|
||||||
"system_tray_update.icon",
|
"system_tray_update.icon",
|
||||||
"system_tray_volume_mute.icon",
|
"system_tray_volume_mute.icon",
|
||||||
"tabs.icon",
|
|
||||||
"three_dot_more.icon",
|
"three_dot_more.icon",
|
||||||
"three_files.icon",
|
"three_files.icon",
|
||||||
"thumb_down.icon",
|
"thumb_down.icon",
|
||||||
|
@@ -0,0 +1,28 @@
|
|||||||
|
// Copyright 2025 The Chromium Authors
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
CANVAS_DIMENSIONS, 20,
|
||||||
|
R_MOVE_TO, 4, 3,
|
||||||
|
R_H_LINE_TO, 12,
|
||||||
|
R_CUBIC_TO, 1.1, 0, 2, 0.9, 2, 2,
|
||||||
|
R_V_LINE_TO, 10,
|
||||||
|
R_CUBIC_TO, 0, 1.1, -0.9, 2, -2, 2,
|
||||||
|
R_H_LINE_TO, -12,
|
||||||
|
R_CUBIC_TO, -1.1, 0, -2, -0.9, -2, -2,
|
||||||
|
R_V_LINE_TO, -10,
|
||||||
|
R_CUBIC_TO, 0, -1.1, 0.9, -2, 2, -2,
|
||||||
|
CLOSE,
|
||||||
|
R_MOVE_TO, 0, 2,
|
||||||
|
R_V_LINE_TO, 10,
|
||||||
|
R_H_LINE_TO, 12,
|
||||||
|
R_V_LINE_TO, -10,
|
||||||
|
CLOSE,
|
||||||
|
R_MOVE_TO, 2.5, 1,
|
||||||
|
R_H_LINE_TO, 3,
|
||||||
|
R_CUBIC_TO, 0.83, 0, 1.5, 0.67, 1.5, 1.5,
|
||||||
|
R_CUBIC_TO, 0, 0.83, -0.67, 1.5, -1.5, 1.5,
|
||||||
|
R_H_LINE_TO, -3,
|
||||||
|
R_CUBIC_TO, -0.83, 0, -1.5, -0.67, -1.5, -1.5,
|
||||||
|
R_CUBIC_TO, 0, -0.83, 0.67, -1.5, 1.5, -1.5,
|
||||||
|
CLOSE
|
@@ -0,0 +1,28 @@
|
|||||||
|
// Copyright 2025 The Chromium Authors
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
CANVAS_DIMENSIONS, 20,
|
||||||
|
R_MOVE_TO, 4, 3,
|
||||||
|
R_H_LINE_TO, 12,
|
||||||
|
R_CUBIC_TO, 1.1, 0, 2, 0.9, 2, 2,
|
||||||
|
R_V_LINE_TO, 10,
|
||||||
|
R_CUBIC_TO, 0, 1.1, -0.9, 2, -2, 2,
|
||||||
|
R_H_LINE_TO, -12,
|
||||||
|
R_CUBIC_TO, -1.1, 0, -2, -0.9, -2, -2,
|
||||||
|
R_V_LINE_TO, -10,
|
||||||
|
R_CUBIC_TO, 0, -1.1, 0.9, -2, 2, -2,
|
||||||
|
CLOSE,
|
||||||
|
R_MOVE_TO, 0, 2,
|
||||||
|
R_V_LINE_TO, 10,
|
||||||
|
R_H_LINE_TO, 12,
|
||||||
|
R_V_LINE_TO, -10,
|
||||||
|
CLOSE,
|
||||||
|
R_MOVE_TO, 6.5, 1,
|
||||||
|
R_H_LINE_TO, 3,
|
||||||
|
R_CUBIC_TO, 0.83, 0, 1.5, 0.67, 1.5, 1.5,
|
||||||
|
R_CUBIC_TO, 0, 0.83, -0.67, 1.5, -1.5, 1.5,
|
||||||
|
R_H_LINE_TO, -3,
|
||||||
|
R_CUBIC_TO, -0.83, 0, -1.5, -0.67, -1.5, -1.5,
|
||||||
|
R_CUBIC_TO, 0, -0.83, 0.67, -1.5, 1.5, -1.5,
|
||||||
|
CLOSE
|
Reference in New Issue
Block a user