Skip to content
Permalink
Browse files
[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):

Canonical link: https://commits.webkit.org/121756@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136136 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Tiancheng Jiang authored and webkit-commit-queue committed Nov 29, 2012
1 parent c2188a1 commit 4e5331a96d8e656b208c8f2ed5777df5b1b80388
Showing 3 changed files with 28 additions and 4 deletions.
@@ -1,3 +1,21 @@
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>

GraphicsSurfaceGLX: remove redundant parameter from resolveGLMethods.
@@ -20,6 +20,15 @@ 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;
}

select {
border-radius: 0;
}
@@ -123,7 +123,6 @@ const RGBA32 dragRollDark = 0xff69a8ff;

const RGBA32 blackPen = Color::black;
const RGBA32 focusRingPen = 0xffa3c8fe;
const RGBA32 activeTextColor = 0xfffafafa;

float RenderThemeBlackBerry::defaultFontSize = 16;

@@ -617,7 +616,6 @@ bool RenderThemeBlackBerry::paintButton(RenderObject* object, const PaintInfo& i
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 @@ bool RenderThemeBlackBerry::paintMenuList(RenderObject* object, const PaintInfo&
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());

0 comments on commit 4e5331a

Please sign in to comment.