summaryrefslogtreecommitdiffstats
path: root/views/controls/button
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 22:34:59 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 22:34:59 +0000
commitca32a43d3d00983134f0ecec4e43a5a8dc0b61da (patch)
tree247221d443cf96540b8db75ae3c631ec163e256a /views/controls/button
parent06cafed03fc3a63eb1282d1416c3629faa33c762 (diff)
downloadchromium_src-ca32a43d3d00983134f0ecec4e43a5a8dc0b61da.zip
chromium_src-ca32a43d3d00983134f0ecec4e43a5a8dc0b61da.tar.gz
chromium_src-ca32a43d3d00983134f0ecec4e43a5a8dc0b61da.tar.bz2
Makes views not draw focus for native controls on Gtk. As Gtk renders
the focus for us, this resulted in double the focus indicators. BUG=none TEST=none Review URL: http://codereview.chromium.org/468004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
-rw-r--r--views/controls/button/native_button.cc6
-rw-r--r--views/controls/button/native_button.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 811fb56..a8f22dd 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -12,6 +12,7 @@
#include "app/l10n_util.h"
#include "base/keyboard_codes.h"
#include "base/logging.h"
+#include "views/controls/native/native_view_host.h"
namespace views {
@@ -191,6 +192,11 @@ void NativeButton::Focus() {
// keyboard messages).
}
+void NativeButton::PaintFocusBorder(gfx::Canvas* canvas) {
+ if (NativeViewHost::kRenderNativeControlFocus)
+ View::PaintFocusBorder(canvas);
+}
+
////////////////////////////////////////////////////////////////////////////////
// NativeButton, protected:
diff --git a/views/controls/button/native_button.h b/views/controls/button/native_button.h
index c1ecfb8..f69b2b6 100644
--- a/views/controls/button/native_button.h
+++ b/views/controls/button/native_button.h
@@ -54,6 +54,7 @@ class NativeButton : public Button {
virtual void Layout();
virtual void SetEnabled(bool flag);
virtual void Focus();
+ virtual void PaintFocusBorder(gfx::Canvas* canvas);
protected:
virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);