Title: [167907] trunk/Source/WebCore
- Revision
- 167907
- Author
- d...@apple.com
- Date
- 2014-04-28 14:17:35 -0700 (Mon, 28 Apr 2014)
Log Message
[Mac] Use the animated version of setHighlighted on NSButtonCell where available
https://bugs.webkit.org/show_bug.cgi?id=132295
<rdar://problem/16747240>
Reviewed by Beth Dakin.
Like setState, there is an animated version of setHighlighted available.
* platform/mac/ThemeMac.mm:
(WebCore::updateStates): Use private version of _setHighlighted where possible.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167906 => 167907)
--- trunk/Source/WebCore/ChangeLog 2014-04-28 21:14:48 UTC (rev 167906)
+++ trunk/Source/WebCore/ChangeLog 2014-04-28 21:17:35 UTC (rev 167907)
@@ -1,3 +1,16 @@
+2014-04-28 Dean Jackson <d...@apple.com>
+
+ [Mac] Use the animated version of setHighlighted on NSButtonCell where available
+ https://bugs.webkit.org/show_bug.cgi?id=132295
+ <rdar://problem/16747240>
+
+ Reviewed by Beth Dakin.
+
+ Like setState, there is an animated version of setHighlighted available.
+
+ * platform/mac/ThemeMac.mm:
+ (WebCore::updateStates): Use private version of _setHighlighted where possible.
+
2014-04-28 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r167855.
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (167906 => 167907)
--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2014-04-28 21:14:48 UTC (rev 167906)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2014-04-28 21:17:35 UTC (rev 167907)
@@ -193,6 +193,9 @@
static void updateStates(NSCell* cell, const ControlStates* controlStates, bool useAnimation = false)
{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 10100
+ UNUSED_PARAM(useAnimation);
+#endif
ControlStates::States states = controlStates->states();
// Hover state is not supported by Aqua.
@@ -200,8 +203,13 @@
// Pressed state
bool oldPressed = [cell isHighlighted];
bool pressed = states & ControlStates::PressedState;
- if (pressed != oldPressed)
+ if (pressed != oldPressed) {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+ [(NSButtonCell*)cell _setHighlighted:pressed animated:useAnimation];
+#else
[cell setHighlighted:pressed];
+#endif
+ }
// Enabled state
bool oldEnabled = [cell isEnabled];
@@ -219,7 +227,6 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
[(NSButtonCell*)cell _setState:newState animated:useAnimation];
#else
- UNUSED_PARAM(useAnimation);
[cell setState:newState];
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
