Changeset 136136 in webkit

Timestamp:

Nov 29, 2012 9:09:57 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Update BB10 form theme.
​https://bugs.webkit.org/show_bug.cgi?id=100760

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

Internally Reviewed by Eli Fidler.
Set text color after buttons are pressed.

• css/themeBlackBerry.css:

(input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]:active::-webkit-file-upload-button, button:active):
(select:active):

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore):
(WebCore::RenderThemeBlackBerry::paintButton):
(WebCore::RenderThemeBlackBerry::paintMenuList):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Update BB10 form theme.
+        https://bugs.webkit.org/show_bug.cgi?id=100760
+
+        Reviewed by Rob Buis.
+
+        Internally Reviewed by Eli Fidler.
+        Set text color after buttons are pressed.
+
+        * css/themeBlackBerry.css:
+        (input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]:active::-webkit-file-upload-button, button:active):
+        (select:active):
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore):
+        (WebCore::RenderThemeBlackBerry::paintButton):
+        (WebCore::RenderThemeBlackBerry::paintMenuList):
+
 2012-11-29  Zeno Albisser  <zeno@webkit.org>
 

trunk/Source/WebCore/css/themeBlackBerry.css

@@ -19 +19 @@
 textarea {
     font-family: monospace;
+}
+
+/* If the select do not have multiple nor size larger than 1 attribute, which are menulist appearance, we wanna change text color when it is actived. */
+input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]:active::-webkit-file-upload-button, button:active, select:not([multiple]):not([size]):active, select[size="0"]:active, select[size="1"]:active {
+    color: #fafafa;
+}
+
+input[type="button"]:active:disabled, input[type="submit"]:active:disabled, input[type="reset"]:active:disabled, input[type="file"]:active:disabled::-webkit-file-upload-button, button:active:disabled, select:not([multiple]):not([size]):active:disabled, select[size="0"]:active:disabled, select[size="1"]:active:disabled {
+    color: GrayText;
 }
 

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

@@ -124 +124 @@
 const RGBA32 blackPen = Color::black;
 const RGBA32 focusRingPen = 0xffa3c8fe;
-const RGBA32 activeTextColor = 0xfffafafa;
 
 float RenderThemeBlackBerry::defaultFontSize = 16;
@@ -618 +617 @@
     } else if (isPressed(object)) {
         drawNineSlice(context, rect, ctm.xScale(), pressed.get(), largeSlice);
-        object->style()->setTextFillColor(activeTextColor);
     } else
         drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
@@ -665 +663 @@
         drawNineSlice(context, rect, ctm.xScale(), disabled.get(), largeSlice);
         drawControl(context, tmpRect, arrowUp.get()); // FIXME: should have a disabled image.
-    } else if (isFocused(object)) {
+    } else if (isPressed(object)) {
         drawNineSlice(context, rect, ctm.xScale(), pressed.get(), largeSlice);
         drawControl(context, tmpRect, arrowUpPressed.get());
-        object->style()->setTextFillColor(activeTextColor);
     } else {
         drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);