OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/common/system/tray/tray_utils.h" | 5 #include "ash/common/system/tray/tray_utils.h" |
6 | 6 |
7 #include "ash/common/shelf/wm_shelf_util.h" | 7 #include "ash/common/shelf/wm_shelf_util.h" |
8 #include "ash/common/system/tray/tray_constants.h" | 8 #include "ash/common/system/tray/tray_constants.h" |
9 #include "ash/common/system/tray/tray_item_view.h" | 9 #include "ash/common/system/tray/tray_item_view.h" |
10 #include "ui/accessibility/ax_view_state.h" | 10 #include "ui/accessibility/ax_view_state.h" |
11 #include "ui/gfx/font_list.h" | 11 #include "ui/gfx/font_list.h" |
12 #include "ui/gfx/geometry/vector2d.h" | 12 #include "ui/gfx/geometry/vector2d.h" |
13 #include "ui/views/border.h" | 13 #include "ui/views/border.h" |
14 #include "ui/views/controls/label.h" | 14 #include "ui/views/controls/label.h" |
15 | 15 |
16 namespace ash { | 16 namespace ash { |
17 | 17 |
18 void SetupLabelForTray(views::Label* label) { | 18 void SetupLabelForTray(views::Label* label) { |
19 label->SetFontList( | 19 label->SetFontList( |
20 gfx::FontList().Derive(1, gfx::Font::NORMAL, gfx::Font::Weight::BOLD)); | 20 gfx::FontList().Derive(1, gfx::Font::NORMAL, gfx::Font::Weight::BOLD)); |
21 label->SetAutoColorReadabilityEnabled(false); | |
22 label->SetEnabledColor(SK_ColorWHITE); | |
23 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255)); | |
24 label->SetShadows(gfx::ShadowValues( | 21 label->SetShadows(gfx::ShadowValues( |
25 1, | 22 1, |
26 gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0)))); | 23 gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0)))); |
27 } | 24 } |
28 | 25 |
29 void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment) { | 26 void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment) { |
30 if (IsHorizontalAlignment(alignment)) { | 27 if (IsHorizontalAlignment(alignment)) { |
31 tray_view->SetBorder(views::Border::CreateEmptyBorder( | 28 tray_view->SetBorder(views::Border::CreateEmptyBorder( |
32 0, kTrayImageItemHorizontalPaddingBottomAlignment, 0, | 29 0, kTrayImageItemHorizontalPaddingBottomAlignment, 0, |
33 kTrayImageItemHorizontalPaddingBottomAlignment)); | 30 kTrayImageItemHorizontalPaddingBottomAlignment)); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 // Do not descend into static text labels which may compute their own labels | 65 // Do not descend into static text labels which may compute their own labels |
69 // recursively. | 66 // recursively. |
70 if (temp_state.role == ui::AX_ROLE_STATIC_TEXT) | 67 if (temp_state.role == ui::AX_ROLE_STATIC_TEXT) |
71 return; | 68 return; |
72 | 69 |
73 for (int i = 0; i < view->child_count(); ++i) | 70 for (int i = 0; i < view->child_count(); ++i) |
74 GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels); | 71 GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels); |
75 } | 72 } |
76 | 73 |
77 } // namespace ash | 74 } // namespace ash |
OLD | NEW |