Changeset 150769 in webkit

Timestamp:

May 27, 2013 11:39:02 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Checkbox UX update.
​https://bugs.webkit.org/show_bug.cgi?id=116838.

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

BlackBerry PR 342302.
Internally Reviewed by Jeff Rogers.
Remove old background and change pressed checkmark image.

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore::RenderThemeBlackBerry::paintCheckbox):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-27  Tiancheng Jiang  <tijiang@rim.com>
+
+        Checkbox UX update.
+        https://bugs.webkit.org/show_bug.cgi?id=116838.
+
+        Reviewed by Rob Buis.
+
+        BlackBerry PR 342302.
+        Internally Reviewed by Jeff Rogers.
+        Remove old background and change pressed checkmark image.
+
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::RenderThemeBlackBerry::paintCheckbox):
+
 2013-05-27  Sam Weinig  <sam@webkit.org>
 

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

@@ -446 +446 @@
     GraphicsContext* context = info.context;
 
-    static RefPtr<Image> disabled, background, inactive, pressed, active, activeMark, disableMark;
+    static RefPtr<Image> disabled, inactive, pressed, active, activeMark, disableMark, pressedMark;
     if (!disabled) {
         disabled = loadImage("core_checkbox_disabled");
-        background = loadImage("core_checkbox_moat");
         inactive = loadImage("core_checkbox_inactive");
         pressed = loadImage("core_checkbox_pressed");
@@ -455 +454 @@
         activeMark = loadImage("core_checkbox_active_mark");
         disableMark = loadImage("core_checkbox_disabled_mark");
+        pressedMark = loadImage("core_checkbox_pressed_mark");
     }
 
@@ -466 +466 @@
     FloatRect centerRect(centerX, centerY, width, height);
 
-    drawControl(context, rect, background.get());
-
     if (isEnabled(object)) {
         if (isPressed(object)) {
             drawControl(context, rect, pressed.get());
             if (isChecked(object)) {
-                // FIXME: need opacity 30% on activeMark
-                drawControl(context, centerRect, activeMark.get());
+                drawControl(context, centerRect, pressedMark.get());
             }
         } else {