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 "ui/views/controls/separator.h" | 5 #include "ui/views/controls/separator.h" |
6 | 6 |
7 #include "ui/accessibility/ax_view_state.h" | 7 #include "ui/accessibility/ax_view_state.h" |
8 #include "ui/gfx/canvas.h" | 8 #include "ui/gfx/canvas.h" |
9 | 9 |
10 namespace views { | 10 namespace views { |
11 | 11 |
12 // static | 12 // static |
13 const char Separator::kViewClassName[] = "Separator"; | 13 const char Separator::kViewClassName[] = "Separator"; |
14 | 14 |
15 // The separator height in pixels. | 15 // The separator size in pixels. |
16 const int kSeparatorHeight = 1; | 16 const int kSeparatorSize = 1; |
17 | 17 |
18 // Default color of the separator. | 18 // Default color of the separator. |
19 const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233); | 19 const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233); |
20 | 20 |
21 Separator::Separator(Orientation orientation) : orientation_(orientation) { | 21 Separator::Separator(Orientation orientation) |
22 : orientation_(orientation), | |
23 color_(kDefaultColor), | |
24 size_(kSeparatorSize) { | |
22 SetFocusable(false); | 25 SetFocusable(false); |
23 } | 26 } |
24 | 27 |
25 Separator::~Separator() { | 28 Separator::~Separator() { |
26 } | 29 } |
27 | 30 |
31 void Separator::SetColor(SkColor color) { | |
32 color_ = color; | |
sky
2014/11/18 20:05:33
SchedulePaint.
melandory
2014/11/18 20:22:40
Done.
| |
33 } | |
34 | |
35 void Separator::SetSize(int size) { | |
36 size_ = size; | |
sky
2014/11/18 20:05:32
If size != size_ this should call PreferredSizeCha
melandory
2014/11/18 20:22:40
Done. Should't SchedulePaint be called also here?
sky
2014/11/18 22:05:26
No, you only care about once the bounds actually c
| |
37 } | |
38 | |
28 //////////////////////////////////////////////////////////////////////////////// | 39 //////////////////////////////////////////////////////////////////////////////// |
29 // Separator, View overrides: | 40 // Separator, View overrides: |
30 | 41 |
31 gfx::Size Separator::GetPreferredSize() const { | 42 gfx::Size Separator::GetPreferredSize() const { |
32 if (orientation_ == HORIZONTAL) | 43 if (orientation_ == HORIZONTAL) |
33 return gfx::Size(width(), kSeparatorHeight); | 44 return gfx::Size(width(), size_); |
34 return gfx::Size(kSeparatorHeight, height()); | 45 return gfx::Size(size_, height()); |
35 } | 46 } |
36 | 47 |
37 void Separator::GetAccessibleState(ui::AXViewState* state) { | 48 void Separator::GetAccessibleState(ui::AXViewState* state) { |
38 state->role = ui::AX_ROLE_SPLITTER; | 49 state->role = ui::AX_ROLE_SPLITTER; |
39 } | 50 } |
40 | 51 |
41 void Separator::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) { | 52 void Separator::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) { |
42 canvas->FillRect(bounds(), kDefaultColor); | 53 canvas->FillRect(bounds(), color_); |
43 } | 54 } |
44 | 55 |
45 const char* Separator::GetClassName() const { | 56 const char* Separator::GetClassName() const { |
46 return kViewClassName; | 57 return kViewClassName; |
47 } | 58 } |
48 | 59 |
49 } // namespace views | 60 } // namespace views |
OLD | NEW |