Commit dc750109 authored by tfarina@chromium.org's avatar tfarina@chromium.org

ash/wm: Use gfx::Canvas::FillRect to draw the separator line instead of relying in DrawLine.

BUG=100898
R=pkasting@chromium.org,sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9703034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126774 0039d316-1c4b-4281-b951-d872f2087c98
parent 1388ccff
...@@ -19,12 +19,15 @@ ...@@ -19,12 +19,15 @@
namespace ash { namespace ash {
namespace { namespace {
const int kClientViewPaddingLeft = 0; const int kClientViewPaddingLeft = 0;
const int kClientViewPaddingRight = 0; const int kClientViewPaddingRight = 0;
const int kClientViewPaddingBottom = 0; const int kClientViewPaddingBottom = 0;
const int kSeparatorWidth = 1;
const SkColor kCaptionColor = SK_ColorGRAY; const SkColor kCaptionColor = SK_ColorGRAY;
const SkColor kCaptionIconDivisorColor = SkColorSetARGB(0xFF, 0x55, 0x55, 0x55); const SkColor kCaptionIconSeparatorColor = SkColorSetRGB(0x55, 0x55, 0x55);
}
} // namespace
// Buttons for panel control // Buttons for panel control
class PanelControlButton : public views::CustomButton { class PanelControlButton : public views::CustomButton {
...@@ -90,11 +93,9 @@ class PanelCaption : public views::View, ...@@ -90,11 +93,9 @@ class PanelCaption : public views::View,
// Overridden from views::View: // Overridden from views::View:
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
canvas->FillRect(GetLocalBounds(), kCaptionColor); canvas->FillRect(GetLocalBounds(), kCaptionColor);
gfx::Rect close_button_bounds = close_button_->bounds(); gfx::Rect separator(close_button_->bounds());
canvas->DrawLine( separator.set_width(kSeparatorWidth);
gfx::Point(close_button_bounds.x(), close_button_bounds.y()), canvas->FillRect(separator, kCaptionIconSeparatorColor);
gfx::Point(close_button_bounds.x(), close_button_bounds.bottom()),
kCaptionIconDivisorColor);
} }
virtual void Layout() OVERRIDE { virtual void Layout() OVERRIDE {
...@@ -182,4 +183,4 @@ gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds( ...@@ -182,4 +183,4 @@ gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds(
return window_bounds; return window_bounds;
} }
} } // namespace ash
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment