diff options
| author | Yoann Lopes <yoann.lopes@nokia.com> | 2010-09-20 11:53:23 (GMT) |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@nokia.com> | 2010-09-20 12:02:16 (GMT) |
| commit | 6c8dcd5744e2c14d122f0967de72a9e171dd9715 (patch) | |
| tree | a675b49c6b5dd78b15f7545c66b374d337caa73a /src/opengl | |
| parent | de808f3c91afaecfc9d7a9a7ea6ff7533dfd1e1b (diff) | |
| download | Qt-6c8dcd5744e2c14d122f0967de72a9e171dd9715.zip Qt-6c8dcd5744e2c14d122f0967de72a9e171dd9715.tar.gz Qt-6c8dcd5744e2c14d122f0967de72a9e171dd9715.tar.bz2 | |
Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).
Task-number: QTBUG-13409
Reviewed-by: Trond
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulatingstroker.cpp | 1 | ||||
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp index 9bc099d..7b0b8a2 100644 --- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp +++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp @@ -509,6 +509,7 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c m_dash_stroker.setDashPattern(pen.dashPattern()); m_dash_stroker.setStrokeWidth(cosmetic ? width * m_inv_scale : width); + m_dash_stroker.setDashOffset(pen.dashOffset()); m_dash_stroker.setMiterLimit(pen.miterLimit()); m_dash_stroker.setClipRect(clip); diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 12c487d..a5ec12f 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -921,6 +921,7 @@ static inline QPainterPath strokeForPath(const QPainterPath &path, const QPen &c stroker.setCapStyle(cpen.capStyle()); stroker.setJoinStyle(cpen.joinStyle()); stroker.setMiterLimit(cpen.miterLimit()); + stroker.setDashOffset(cpen.dashOffset()); qreal width = cpen.widthF(); if (width == 0) |