Title: [151596] trunk/Source/WebCore
Revision
151596
Author
[email protected]
Date
2013-06-14 09:25:51 -0700 (Fri, 14 Jun 2013)

Log Message

[BlackBerry] Dropdown button UX updates.
https://bugs.webkit.org/show_bug.cgi?id=117642.

Patch by Tiancheng Jiang <[email protected]> on 2013-06-14
Reviewed by Rob Buis.

JIRA 388652
Internally Reviewed by Jeff Rogers.

Change arrow assert.

* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::RenderThemeBlackBerry::paintMenuList):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151595 => 151596)


--- trunk/Source/WebCore/ChangeLog	2013-06-14 15:00:38 UTC (rev 151595)
+++ trunk/Source/WebCore/ChangeLog	2013-06-14 16:25:51 UTC (rev 151596)
@@ -1,3 +1,18 @@
+2013-06-14  Tiancheng Jiang  <[email protected]>
+
+        [BlackBerry] Dropdown button UX updates.
+        https://bugs.webkit.org/show_bug.cgi?id=117642.
+
+        Reviewed by Rob Buis.
+
+        JIRA 388652
+        Internally Reviewed by Jeff Rogers.
+
+        Change arrow assert.
+
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::RenderThemeBlackBerry::paintMenuList):
+
 2013-06-14  Arvid Nilsson  <[email protected]>
 
         [BlackBerry] LayerTiler fails to tile really big layers

Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (151595 => 151596)


--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp	2013-06-14 15:00:38 UTC (rev 151595)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp	2013-06-14 16:25:51 UTC (rev 151596)
@@ -586,13 +586,13 @@
     info.context->save();
     GraphicsContext* context = info.context;
 
-    static RefPtr<Image> disabled, inactive, pressed, arrowUp, arrowUpPressed;
+    static RefPtr<Image> disabled, inactive, pressed, arrowUp, arrowUpDisabled;
     if (!disabled) {
         disabled = loadImage("core_button_disabled");
         inactive = loadImage("core_button_inactive");
         pressed = loadImage("core_button_pressed");
         arrowUp = loadImage("core_dropdown_button_arrowup");
-        arrowUpPressed = loadImage("core_dropdown_button_arrowup_pressed");
+        arrowUpDisabled = loadImage("core_dropdown_button_arrowup_disabled");
     }
 
     FloatRect arrowButtonRectangle(computeMenuListArrowButtonRect(rect));
@@ -606,10 +606,10 @@
     if (!isEnabled(object)) {
         drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
         drawNineSlice(context, rect, ctm.xScale(), disabled.get(), largeSlice);
-        drawControl(context, tmpRect, arrowUp.get()); // FIXME: should have a disabled image.
+        drawControl(context, tmpRect, arrowUpDisabled.get());
     } else if (isPressed(object)) {
         drawNineSlice(context, rect, ctm.xScale(), pressed.get(), largeSlice);
-        drawControl(context, tmpRect, arrowUpPressed.get());
+        drawControl(context, tmpRect, arrowUp.get());
     } else {
         drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
         drawControl(context, tmpRect, arrowUp.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to