Make it possible to set color of QStaticText with pixel size >= 64
Adding the fallback to QPainterPath for large QStaticTexts created a regression where all text would be painted in black regardless of the color you set on it. The color in QStaticTextItem is sometimes invalid, in which case the current painter color should be used. In either case, the color is already set on the current pen when entering drawStaticTextItem() so we can just use that. Task-number: QTBUG-19950 Reviewed-by: Jiang Jiang (cherry picked from commit ee77ee5c25f58271e6f2863225d08573da86c3ee) Change-Id: I955aa6526e5b14589430f8dccd006a9de9ae08c9 Reviewed-on: http://codereview.qt.nokia.com/491 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>bb10
parent
b9fcfa18f5
commit
f562b90518
|
|
@ -1084,7 +1084,7 @@ void QPaintEngineEx::drawStaticTextItem(QStaticTextItem *staticTextItem)
|
|||
changedHints = true;
|
||||
}
|
||||
|
||||
fill(qtVectorPathForPath(path), staticTextItem->color);
|
||||
fill(qtVectorPathForPath(path), s->pen.color());
|
||||
|
||||
if (changedHints) {
|
||||
s->renderHints = oldHints;
|
||||
|
|
|
|||
Loading…
Reference in New Issue