diff options
author | Mitch Curtis <mitch.curtis@digia.com> | 2013-06-13 10:50:31 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-14 15:52:01 +0200 |
commit | 4cb1981907eabc62069a3a8330c370223632013c (patch) | |
tree | c2ac48559a303769cf36c4e3c53c6bd863a14a15 /src | |
parent | f702dfa75ff8817e97f466d18b7c616c38f0d866 (diff) |
Set default font size to 10px as per spec, not 10pt.
See: http://www.w3.org/TR/2dcontext/#dom-context-2d-font
Also removes duplicated assignments that are done as part of the
default constructor.
Task-number: QTBUG-31716
Change-Id: I5bd131c14a5defd422d858f02974c215de7adae9
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 23 | ||||
-rw-r--r-- | src/quick/items/context2d/qquickcontext2d_p.h | 3 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 35ea28b81f..111d02e804 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -3676,7 +3676,6 @@ void QQuickContext2D::pushState() void QQuickContext2D::reset() { QQuickContext2D::State newState; - newState.matrix = QTransform(); m_path = QPainterPath(); @@ -3688,28 +3687,6 @@ void QQuickContext2D::reset() newState.clipPath = defaultClipPath; newState.clipPath.setFillRule(Qt::WindingFill); - newState.strokeStyle = QColor("#000000"); - newState.fillStyle = QColor("#000000"); - newState.fillPatternRepeatX = false; - newState.fillPatternRepeatY = false; - newState.strokePatternRepeatX = false; - newState.strokePatternRepeatY = false; - newState.invertibleCTM = true; - newState.fillRule = Qt::WindingFill; - newState.globalAlpha = 1.0; - newState.lineWidth = 1; - newState.lineCap = Qt::FlatCap; - newState.lineJoin = Qt::MiterJoin; - newState.miterLimit = 10; - newState.shadowOffsetX = 0; - newState.shadowOffsetY = 0; - newState.shadowBlur = 0; - newState.shadowColor = qRgba(0, 0, 0, 0); - newState.globalCompositeOperation = QPainter::CompositionMode_SourceOver; - newState.font = QFont(QLatin1String("sans-serif"), 10); - newState.textAlign = QQuickContext2D::Start; - newState.textBaseline = QQuickContext2D::Alphabetic; - m_stateStack.clear(); m_stateStack.push(newState); popState(); diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index 24f5c44f18..6256249327 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -130,10 +130,11 @@ public: , shadowBlur(0) , shadowColor(qRgba(0, 0, 0, 0)) , globalCompositeOperation(QPainter::CompositionMode_SourceOver) - , font(QFont(QLatin1String("sans-serif"), 10)) + , font(QFont(QLatin1String("sans-serif"))) , textAlign(QQuickContext2D::Start) , textBaseline(QQuickContext2D::Alphabetic) { + font.setPixelSize(10); } QTransform matrix; |