projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d65688b
)
Fix alpha being ignored in Text element
author
Glenn Watson
<glenn.watson@nokia.com>
Thu, 7 Jun 2012 00:06:14 +0000
(10:06 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 7 Jun 2012 00:12:27 +0000
(
02:12
+0200)
The text element was using the implicit constructor to convert
QRgb -> QColor which ignores alpha. Use the explicit conversion.
Change-Id: I7975ffeab8b423716b9655776f38b0ca2f282cd0
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
src/quick/items/qquicktext.cpp
patch
|
blob
|
history
diff --git
a/src/quick/items/qquicktext.cpp
b/src/quick/items/qquicktext.cpp
index
409f9a9
..
1f16cbd
100644
(file)
--- a/
src/quick/items/qquicktext.cpp
+++ b/
src/quick/items/qquicktext.cpp
@@
-2165,7
+2165,7
@@
QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data
node->addTextLayout(
QPoint(0, bounds.y()),
&d->layout,
-
d->color, d->style, d->styleColor, d->
linkColor,
+
color, d->style, styleColor,
linkColor,
QColor(), QColor(), -1, -1,
0, unelidedLineCount);
}