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

Side by Side Diff: ui/views/controls/focusable_border.cc

Issue 516943003: Add textfield internal padding from FocusableBorder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore Insets const ref. Created 6 years, 3 months 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
« no previous file with comments | « ui/views/controls/focusable_border.h ('k') | ui/views/controls/textfield/textfield.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/focusable_border.h" 5 #include "ui/views/controls/focusable_border.h"
6 6
7 #include "ui/gfx/canvas.h" 7 #include "ui/gfx/canvas.h"
8 #include "ui/gfx/insets.h" 8 #include "ui/gfx/insets.h"
9 #include "ui/gfx/skia_util.h" 9 #include "ui/gfx/skia_util.h"
10 #include "ui/native_theme/native_theme.h" 10 #include "ui/native_theme/native_theme.h"
11 11
12 namespace { 12 namespace {
13 13
14 // Define the size of the insets 14 const int kInsetSize = 1;
15 const int kTopInsetSize = 4;
16 const int kLeftInsetSize = 4;
17 const int kBottomInsetSize = 4;
18 const int kRightInsetSize = 4;
19 15
20 } // namespace 16 } // namespace
21 17
22 namespace views { 18 namespace views {
23 19
24 FocusableBorder::FocusableBorder() 20 FocusableBorder::FocusableBorder()
25 : insets_(kTopInsetSize, kLeftInsetSize, 21 : insets_(kInsetSize, kInsetSize, kInsetSize, kInsetSize),
26 kBottomInsetSize, kRightInsetSize),
27 override_color_(SK_ColorWHITE), 22 override_color_(SK_ColorWHITE),
28 use_default_color_(true) { 23 use_default_color_(true) {
29 } 24 }
30 25
26 FocusableBorder::~FocusableBorder() {
27 }
28
31 void FocusableBorder::SetColor(SkColor color) { 29 void FocusableBorder::SetColor(SkColor color) {
32 override_color_ = color; 30 override_color_ = color;
33 use_default_color_ = false; 31 use_default_color_ = false;
34 } 32 }
35 33
36 void FocusableBorder::UseDefaultColor() { 34 void FocusableBorder::UseDefaultColor() {
37 use_default_color_ = true; 35 use_default_color_ = true;
38 } 36 }
39 37
40 void FocusableBorder::Paint(const View& view, gfx::Canvas* canvas) { 38 void FocusableBorder::Paint(const View& view, gfx::Canvas* canvas) {
(...skipping 20 matching lines...) Expand all
61 59
62 gfx::Size FocusableBorder::GetMinimumSize() const { 60 gfx::Size FocusableBorder::GetMinimumSize() const {
63 return gfx::Size(); 61 return gfx::Size();
64 } 62 }
65 63
66 void FocusableBorder::SetInsets(int top, int left, int bottom, int right) { 64 void FocusableBorder::SetInsets(int top, int left, int bottom, int right) {
67 insets_.Set(top, left, bottom, right); 65 insets_.Set(top, left, bottom, right);
68 } 66 }
69 67
70 } // namespace views 68 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/focusable_border.h ('k') | ui/views/controls/textfield/textfield.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698