| 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 height in pixels. |
| 16 const int kSeparatorHeight = 1; | 16 const int kSeparatorHeight = 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 : Separator(orientation, kDefaultColor, kSeparatorHeight) { |
| 23 } |
| 24 |
| 25 Separator::Separator(Orientation orientation, SkColor color) |
| 26 : Separator(orientation, color, kSeparatorHeight) { |
| 27 } |
| 28 |
| 29 Separator::Separator(Orientation orientation, SkColor color, int height) |
| 30 : orientation_(orientation), |
| 31 color_(color), |
| 32 height_(height) { |
| 22 SetFocusable(false); | 33 SetFocusable(false); |
| 23 } | 34 } |
| 24 | 35 |
| 25 Separator::~Separator() { | 36 Separator::~Separator() { |
| 26 } | 37 } |
| 27 | 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(), height_); |
| 34 return gfx::Size(kSeparatorHeight, height()); | 45 return gfx::Size(height_, 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 |