diff options
author | Cary Clark <cary@android.com> | 2010-08-25 17:49:25 -0400 |
---|---|---|
committer | Cary Clark <cary@android.com> | 2010-08-27 09:34:48 -0400 |
commit | 7a69d7c255012f3fcc4d9af040600eac1b2e5c56 (patch) | |
tree | 94e69ad31c4d5bc49246f9293551f1287be344be | |
parent | b306622f567766515afd0cd45947d5d2d74f7072 (diff) | |
download | external_webkit-7a69d7c255012f3fcc4d9af040600eac1b2e5c56.zip external_webkit-7a69d7c255012f3fcc4d9af040600eac1b2e5c56.tar.gz external_webkit-7a69d7c255012f3fcc4d9af040600eac1b2e5c56.tar.bz2 |
fix button cursor state
Clear the pressed state for buttons when the cursor is
shown indefinitely, and set look for the pressed cursor
state when recording the button colors.
Change-Id: I78095ec9a7580c372c66b83913447b8214a6a432
http://b/2135321
-rw-r--r-- | WebKit/android/nav/WebView.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index c061461..e12dc52 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -265,7 +265,7 @@ void nativeRecordButtons(bool hasFocus, bool pressed, bool invalidate) // button if (!hasFocus) { state = WebCore::RenderSkinAndroid::kNormal; - } else if (pressed) { + } else if (pressed || m_ring.m_isPressed) { state = WebCore::RenderSkinAndroid::kPressed; } else { state = WebCore::RenderSkinAndroid::kFocused; @@ -957,6 +957,7 @@ void showCursorTimed() void showCursorUntimed() { DBG_NAV_LOG(""); + m_ring.m_isPressed = false; m_ringAnimationEnd = UINT_MAX; viewInvalidate(); } |