Modified: trunk/Source/WebCore/ChangeLog (136135 => 136136)
--- trunk/Source/WebCore/ChangeLog 2012-11-29 17:07:34 UTC (rev 136135)
+++ trunk/Source/WebCore/ChangeLog 2012-11-29 17:09:57 UTC (rev 136136)
@@ -1,3 +1,21 @@
+2012-11-29 Tiancheng Jiang <[email protected]>
+
+ [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 <[email protected]>
GraphicsSurfaceGLX: remove redundant parameter from resolveGLMethods.
Modified: trunk/Source/WebCore/css/themeBlackBerry.css (136135 => 136136)
--- trunk/Source/WebCore/css/themeBlackBerry.css 2012-11-29 17:07:34 UTC (rev 136135)
+++ trunk/Source/WebCore/css/themeBlackBerry.css 2012-11-29 17:09:57 UTC (rev 136136)
@@ -20,6 +20,15 @@
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;
+}
+
select {
border-radius: 0;
}
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (136135 => 136136)
--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-11-29 17:07:34 UTC (rev 136135)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-11-29 17:09:57 UTC (rev 136136)
@@ -123,7 +123,6 @@
const RGBA32 blackPen = Color::black;
const RGBA32 focusRingPen = 0xffa3c8fe;
-const RGBA32 activeTextColor = 0xfffafafa;
float RenderThemeBlackBerry::defaultFontSize = 16;
@@ -617,7 +616,6 @@
drawNineSlice(context, rect, ctm.xScale(), disabled.get(), largeSlice);
} 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);
@@ -664,10 +662,9 @@
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.
- } 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);
drawControl(context, tmpRect, arrowUp.get());
