Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Side by Side Diff: ash/system/tray/tray_popup_header_button.cc

Issue 800513002: Update TrayPopupHeaderButton Visual Feedback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_popup_header_button.h" 5 #include "ash/system/tray/tray_popup_header_button.h"
6 6
7 #include "ash/ash_constants.h" 7 #include "ash/ash_constants.h"
8 #include "ash/system/tray/tray_constants.h" 8 #include "ash/system/tray/tray_constants.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
Mr4D (OOO till 08-26) 2014/12/11 19:50:10 I think you can get rid of this now.
jonross 2014/12/11 21:41:41 Done.
11 #include "ui/views/background.h"
11 #include "ui/views/painter.h" 12 #include "ui/views/painter.h"
12 13
13 namespace ash { 14 namespace ash {
14 15
15 // static 16 // static
16 const char TrayPopupHeaderButton::kViewClassName[] = 17 const char TrayPopupHeaderButton::kViewClassName[] =
17 "tray/TrayPopupHeaderButton"; 18 "tray/TrayPopupHeaderButton";
18 19
19 TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener, 20 TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
20 int enabled_resource_id, 21 int enabled_resource_id,
(...skipping 25 matching lines...) Expand all
46 TrayPopupHeaderButton::~TrayPopupHeaderButton() {} 47 TrayPopupHeaderButton::~TrayPopupHeaderButton() {}
47 48
48 const char* TrayPopupHeaderButton::GetClassName() const { 49 const char* TrayPopupHeaderButton::GetClassName() const {
49 return kViewClassName; 50 return kViewClassName;
50 } 51 }
51 52
52 gfx::Size TrayPopupHeaderButton::GetPreferredSize() const { 53 gfx::Size TrayPopupHeaderButton::GetPreferredSize() const {
53 return gfx::Size(ash::kTrayPopupItemHeight, ash::kTrayPopupItemHeight); 54 return gfx::Size(ash::kTrayPopupItemHeight, ash::kTrayPopupItemHeight);
54 } 55 }
55 56
56 void TrayPopupHeaderButton::OnPaintBorder(gfx::Canvas* canvas) {
57 // Just the left border.
58 const int kBorderHeight = 25;
59 int padding = (height() - kBorderHeight) / 2;
60 canvas->FillRect(gfx::Rect(0, padding, 1, height() - padding * 2),
61 ash::kBorderDarkColor);
62 }
63
64 void TrayPopupHeaderButton::StateChanged() { 57 void TrayPopupHeaderButton::StateChanged() {
58 if (state() == STATE_HOVERED || state() == STATE_PRESSED)
Mr4D (OOO till 08-26) 2014/12/11 19:50:10 Since more lines, please use {}
jonross 2014/12/11 21:41:41 Foiled by git cl format! Done
59 set_background(views::Background::CreateSolidBackground(
60 kTrayPopupHoverBackgroundColor));
61 else
62 set_background(nullptr);
65 SchedulePaint(); 63 SchedulePaint();
66 } 64 }
67 65
68 } // namespace ash 66 } // namespace ash
OLDNEW
« ash/system/tray/tray_details_view_unittest.cc ('K') | « ash/system/tray/tray_popup_header_button.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698