Changeset 150909 in webkit

Timestamp:

May 29, 2013 10:47:26 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Radio Button UX updates.
​https://bugs.webkit.org/show_bug.cgi?id=116881

Patch by Tiancheng Jiang <​tijiang@rim.com> on 2013-05-29
Reviewed by Rob Buis.

BlackBerry PR 342322.
Internally Reviewed by Jeff Rogers.
Change images.

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore::RenderThemeBlackBerry::paintRadio):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/blackberry/RenderThemeBlackBerry.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-29  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Radio Button UX updates.
+        https://bugs.webkit.org/show_bug.cgi?id=116881
+
+        Reviewed by Rob Buis.
+
+        BlackBerry PR 342322.
+        Internally Reviewed by Jeff Rogers.
+        Change images.
+
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::RenderThemeBlackBerry::paintRadio):
+
 2013-05-29  Tiancheng Jiang  <tijiang@rim.com>
 

trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp

@@ -497 +497 @@
     GraphicsContext* context = info.context;
 
-    static RefPtr<Image> disabled, disabledActive, inactive, pressed, active, activeMark;
+    static RefPtr<Image> disabled, disabledDot, inactive, pressed, active, activeDot, pressedDot;
     if (!disabled) {
         disabled = loadImage("core_radiobutton_disabled");
-        disabledActive = loadImage("core_radiobutton_disabled_active");
+        disabledDot = loadImage("core_radiobutton_dot_disabled");
         inactive = loadImage("core_radiobutton_inactive");
         pressed = loadImage("core_radiobutton_pressed");
         active = loadImage("core_radiobutton_active");
-        activeMark = loadImage("core_radiobutton_active_mark");
+        activeDot = loadImage("core_radiobutton_dot_selected");
+        pressedDot = loadImage("core_radiobutton_dot_pressed");
     }
 
@@ -510 +511 @@
     FloatRect tmpRect(rect);
 
-    float centerX = ((float(inactive->width()) - float(activeMark->width())) / float(inactive->width()) * tmpRect.width() / 2)+ tmpRect.x();
-    float centerY = ((float(inactive->height()) - float(activeMark->height())) / float(inactive->height()) * tmpRect.height() / 2) + tmpRect.y();
-    float width = float(activeMark->width()) / float(inactive->width()) * tmpRect.width();
-    float height = float(activeMark->height()) / float(inactive->height()) * tmpRect.height();
+    float centerX = ((float(inactive->width()) - float(activeDot->width())) / float(inactive->width()) * tmpRect.width() / 2)+ tmpRect.x();
+    float centerY = ((float(inactive->height()) - float(activeDot->height())) / float(inactive->height()) * tmpRect.height() / 2) + tmpRect.y();
+    float width = float(activeDot->width()) / float(inactive->width()) * tmpRect.width();
+    float height = float(activeDot->height()) / float(inactive->height()) * tmpRect.height();
     FloatRect centerRect(centerX, centerY, width, height);
 
@@ -519 +520 @@
         if (isPressed(object)) {
             drawControl(context, rect, pressed.get());
-            if (isChecked(object)) {
-                // FIXME: need opacity 30% on activeMark
-                drawControl(context, centerRect, activeMark.get());
-            }
+            if (isChecked(object))
+                drawControl(context, centerRect, pressedDot.get());
         } else {
             drawControl(context, rect, inactive.get());
             if (isChecked(object)) {
                 drawControl(context, rect, active.get());
-                drawControl(context, centerRect, activeMark.get());
+                drawControl(context, centerRect, activeDot.get());
             }
         }
     } else {
-        drawControl(context, rect, inactive.get());
+        drawControl(context, rect, disabled.get());
         if (isChecked(object))
-            drawControl(context, rect, disabledActive.get());
-        else
-            drawControl(context, rect, disabled.get());
+            drawControl(context, rect, disabledDot.get());
     }
     return false;