summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 21:13:54 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 21:13:54 +0000
commit93786d86863a0fc8e83872a78ba875fd08753ae2 (patch)
tree7b20fb2a9155e09fa70370cd4da52e8b817bf9b4 /webkit
parentcf7e592c1d75cd1ffc855667309adcc650112500 (diff)
downloadchromium_src-93786d86863a0fc8e83872a78ba875fd08753ae2.zip
chromium_src-93786d86863a0fc8e83872a78ba875fd08753ae2.tar.gz
chromium_src-93786d86863a0fc8e83872a78ba875fd08753ae2.tar.bz2
Changes to how we draw buttons.
1) Change RenderThemeWin.cpp so that pressed buttons have priority over focused buttons. I.e., if a button is focused and pressed, we should draw it pressed. 2) In classic mode, add the black border for focused buttons and properly add the dotted focus rect. http://crbug.com/135 Review URL: http://codereview.chromium.org/8071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/port/rendering/RenderThemeWin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index d1bc89c..375dde6 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -418,10 +418,10 @@ unsigned RenderThemeWin::determineState(RenderObject* o)
result = TS_DISABLED;
else if (isReadOnlyControl(o))
result = ETS_READONLY; // Readonly is supported on textfields.
+ else if (isPressed(o)) // Active overrides hover and focused.
+ result = TS_PRESSED;
else if (supportsFocus(o->style()->appearance()) && isFocused(o))
result = TS_CHECKED;
- else if (isPressed(o)) // Active overrides hover.
- result = TS_PRESSED;
else if (isHovered(o))
result = TS_HOT;
if (isChecked(o))