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/system/tray/tray_utils.h" | 5 #include "ash/system/tray/tray_utils.h" |
6 | 6 |
7 #include "ash/system/tray/tray_constants.h" | 7 #include "ash/system/tray/tray_constants.h" |
8 #include "ash/system/tray/tray_item_view.h" | 8 #include "ash/system/tray/tray_item_view.h" |
9 #include "ui/gfx/font_list.h" | 9 #include "ui/gfx/font_list.h" |
| 10 #include "ui/gfx/geometry/vector2d.h" |
10 #include "ui/views/border.h" | 11 #include "ui/views/border.h" |
11 #include "ui/views/controls/label.h" | 12 #include "ui/views/controls/label.h" |
12 | 13 |
13 namespace ash { | 14 namespace ash { |
14 | 15 |
15 void SetupLabelForTray(views::Label* label) { | 16 void SetupLabelForTray(views::Label* label) { |
16 label->SetFontList(gfx::FontList().Derive(1, gfx::Font::BOLD)); | 17 label->SetFontList(gfx::FontList().Derive(1, gfx::Font::BOLD)); |
17 label->SetAutoColorReadabilityEnabled(false); | 18 label->SetAutoColorReadabilityEnabled(false); |
18 label->SetEnabledColor(SK_ColorWHITE); | 19 label->SetEnabledColor(SK_ColorWHITE); |
19 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255)); | 20 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255)); |
20 label->SetShadows(gfx::ShadowValues( | 21 label->SetShadows(gfx::ShadowValues( |
21 1, gfx::ShadowValue(gfx::Point(0, 1), 0, SkColorSetARGB(64, 0, 0, 0)))); | 22 1, |
| 23 gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0)))); |
22 } | 24 } |
23 | 25 |
24 void SetTrayImageItemBorder(views::View* tray_view, | 26 void SetTrayImageItemBorder(views::View* tray_view, |
25 ShelfAlignment alignment) { | 27 ShelfAlignment alignment) { |
26 if (alignment == SHELF_ALIGNMENT_BOTTOM || | 28 if (alignment == SHELF_ALIGNMENT_BOTTOM || |
27 alignment == SHELF_ALIGNMENT_TOP) { | 29 alignment == SHELF_ALIGNMENT_TOP) { |
28 tray_view->SetBorder(views::Border::CreateEmptyBorder( | 30 tray_view->SetBorder(views::Border::CreateEmptyBorder( |
29 0, | 31 0, |
30 kTrayImageItemHorizontalPaddingBottomAlignment, | 32 kTrayImageItemHorizontalPaddingBottomAlignment, |
31 0, | 33 0, |
(...skipping 23 matching lines...) Expand all Loading... |
55 tray_view->label()->GetPreferredSize().width()) / 2); | 57 tray_view->label()->GetPreferredSize().width()) / 2); |
56 tray_view->SetBorder(views::Border::CreateEmptyBorder( | 58 tray_view->SetBorder(views::Border::CreateEmptyBorder( |
57 kTrayLabelItemVerticalPaddingVerticalAlignment, | 59 kTrayLabelItemVerticalPaddingVerticalAlignment, |
58 horizontal_padding, | 60 horizontal_padding, |
59 kTrayLabelItemVerticalPaddingVerticalAlignment, | 61 kTrayLabelItemVerticalPaddingVerticalAlignment, |
60 horizontal_padding)); | 62 horizontal_padding)); |
61 } | 63 } |
62 } | 64 } |
63 | 65 |
64 } // namespace ash | 66 } // namespace ash |
OLD | NEW |