Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Unified Diff: ash/common/system/tray/tray_popup_item_style.cc

Issue 2244003002: Materialized font style for TrayItemMore type system tray rows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-ordered static function in Label. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/system/tray/tray_popup_item_style.cc
diff --git a/ash/common/system/tray/tray_popup_item_style.cc b/ash/common/system/tray/tray_popup_item_style.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fba33136a2241e1523b7a27a60de257d8c481f71
--- /dev/null
+++ b/ash/common/system/tray/tray_popup_item_style.cc
@@ -0,0 +1,105 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/common/system/tray/tray_popup_item_style.h"
+
+#include "ash/common/system/tray/tray_popup_item_style_observer.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
+#include "ui/native_theme/native_theme.h"
+#include "ui/views/controls/label.h"
+
+namespace ash {
+namespace {
+
+// TODO(bruthig): Consider adding an 'inactive' color to the NativeTheme
+// and allow Label to use it directly. This would require changing the
+// View::enabled_ flag to a tri-state enum.
+const SkColor kInactiveTextColor = SkColorSetRGB(0x64, 0x64, 0x64);
+} // namespace
+
+TrayPopupItemStyle::TrayPopupItemStyle(const ui::NativeTheme* theme,
+ FontStyle font_style)
+ : theme_(theme),
+ font_style_(font_style),
+ color_style_(ColorStyle::ACTIVE) {}
+
+TrayPopupItemStyle::~TrayPopupItemStyle() {}
+
+void TrayPopupItemStyle::AddObserver(TrayPopupItemStyleObserver* observer) {
+ if (!observers_.HasObserver(observer))
+ observers_.AddObserver(observer);
+}
+
+void TrayPopupItemStyle::RemoveObserver(TrayPopupItemStyleObserver* observer) {
+ observers_.RemoveObserver(observer);
+}
+
+void TrayPopupItemStyle::SetTheme(const ui::NativeTheme* theme) {
+ theme_ = theme;
+ NotifyObserversStyleUpdated();
+}
+
+void TrayPopupItemStyle::SetColorStyle(ColorStyle color_style) {
+ color_style_ = color_style;
+ NotifyObserversStyleUpdated();
+}
+
+void TrayPopupItemStyle::SetFontStyle(FontStyle font_style) {
+ font_style_ = font_style;
+ NotifyObserversStyleUpdated();
+}
+
+SkColor TrayPopupItemStyle::GetForegroundColor() const {
+ switch (color_style_) {
+ case ColorStyle::ACTIVE:
+ return theme_->GetSystemColor(
+ ui::NativeTheme::kColorId_LabelEnabledColor);
+ case ColorStyle::INACTIVE:
+ return kInactiveTextColor;
+ case ColorStyle::DISABLED:
+ return theme_->GetSystemColor(
+ ui::NativeTheme::kColorId_LabelDisabledColor);
+ }
+ NOTREACHED();
+ // Use a noticeable color to help notice unhandled cases.
+ return SK_ColorMAGENTA;
+}
+
+void TrayPopupItemStyle::SetupLabel(views::Label* label) const {
+ label->SetEnabledColor(GetForegroundColor());
+
+ const gfx::FontList& base_font_list = views::Label::GetDefaultFontList();
+ switch (font_style_) {
+ case FontStyle::TITLE:
+ label->SetFontList(base_font_list.Derive(2, gfx::Font::NORMAL,
+ gfx::Font::Weight::MEDIUM));
+ break;
+ case FontStyle::DEFAULT_VIEW_LABEL:
+ label->SetFontList(base_font_list.Derive(2, gfx::Font::NORMAL,
+ gfx::Font::Weight::NORMAL));
+ break;
+ case FontStyle::DETAILED_VIEW_LABEL:
+ case FontStyle::SYSTEM_INFO:
+ label->SetFontList(base_font_list.Derive(1, gfx::Font::NORMAL,
+ gfx::Font::Weight::NORMAL));
+ break;
+ case FontStyle::CAPTION:
+ label->SetFontList(base_font_list.Derive(0, gfx::Font::NORMAL,
+ gfx::Font::Weight::NORMAL));
+ break;
+ case FontStyle::BUTTON:
+ label->SetFontList(base_font_list.Derive(0, gfx::Font::NORMAL,
+ gfx::Font::Weight::MEDIUM));
+ break;
+ }
+}
+
+void TrayPopupItemStyle::NotifyObserversStyleUpdated() {
+ FOR_EACH_OBSERVER(TrayPopupItemStyleObserver, observers_,
+ OnTrayPopupItemStyleUpdated());
+}
+
+} // namespace ash
« no previous file with comments | « ash/common/system/tray/tray_popup_item_style.h ('k') | ash/common/system/tray/tray_popup_item_style_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698