1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QTransform instead of doing transforms manually

Browse Source 
Minor cleanup of QOutlineMapper to take advantage of QTransform.

Change-Id: I15534970a821c7f1de42f4a5a2560f04ae420d16
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
This commit is contained in:
Allan Sandfeld Jensen 2016-04-12 10:12:09 +02:00
parent 0a1c8cc668
commit c327fb79e1
2 changed files with 8 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/painting/qoutlinemapper.cpp
View File

@ -38,9 +38,10 @@
****************************************************************************/ ****************************************************************************/
#include "qoutlinemapper_p.h" #include "qoutlinemapper_p.h"
#include <private/qpainterpath_p.h>
#include "qbezier_p.h"
#include "qmath.h" #include "qmath.h"
#include <private/qbezier_p.h> #include "qpainterpath_p.h"
#include <stdlib.h> #include <stdlib.h>
@ -187,39 +188,9 @@ void QOutlineMapper::endOutline()
QPointF *elements = m_elements.data(); QPointF *elements = m_elements.data();
// Transform the outline // Transform the outline
if (m_txop == QTransform::TxNone) { if (!m_in_clip_elements) {
// Nothing to do. for (int i = 0; i < m_elements.size(); ++i)
} else if (m_txop == QTransform::TxTranslate) { elements[i] = m_transform.map(elements[i]);
for (int i = 0; i < m_elements.size(); ++i) {
QPointF &e = elements[i];
e = QPointF(e.x() + m_dx, e.y() + m_dy);
}
} else if (m_txop == QTransform::TxScale) {
for (int i = 0; i < m_elements.size(); ++i) {
QPointF &e = elements[i];
e = QPointF(m_m11 * e.x() + m_dx, m_m22 * e.y() + m_dy);
}
} else if (m_txop < QTransform::TxProject) {
for (int i = 0; i < m_elements.size(); ++i) {
QPointF &e = elements[i];
e = QPointF(m_m11 * e.x() + m_m21 * e.y() + m_dx,
m_m22 * e.y() + m_m12 * e.x() + m_dy);
}
} else {
const QVectorPath vp((qreal *)elements, m_elements.size(),
m_element_types.size() ? m_element_types.data() : 0);
QPainterPath path = vp.convertToPainterPath();
path = QTransform(m_m11, m_m12, m_m13, m_m21, m_m22, m_m23, m_dx, m_dy, m_m33).map(path);
if (!(m_outline.flags & QT_FT_OUTLINE_EVEN_ODD_FILL))
path.setFillRule(Qt::WindingFill);
uint old_txop = m_txop;
m_txop = QTransform::TxNone;
if (path.isEmpty())
m_valid = false;
else
convertPath(path);
m_txop = old_txop;
return;
} }
controlPointRect = boundingRect(elements, m_elements.size()); controlPointRect = boundingRect(elements, m_elements.size());
@ -387,13 +358,10 @@ void QOutlineMapper::clipElements(const QPointF *elements,
QPainterPath clipPath; QPainterPath clipPath;
clipPath.addRect(m_clip_rect); clipPath.addRect(m_clip_rect);
QPainterPath clippedPath = path.intersected(clipPath); QPainterPath clippedPath = path.intersected(clipPath);
uint old_txop = m_txop;
m_txop = QTransform::TxNone;
if (clippedPath.isEmpty()) if (clippedPath.isEmpty())
m_valid = false; m_valid = false;
else else
convertPath(clippedPath); convertPath(clippedPath);
m_txop = old_txop;
m_in_clip_elements = false; m_in_clip_elements = false;
} }

23
src/gui/painting/qoutlinemapper_p.h
View File

@ -104,16 +104,7 @@ public:
*/ */
void setMatrix(const QTransform &m) void setMatrix(const QTransform &m)
{ {
m_m11 = m.m11(); m_transform = m;
m_m12 = m.m12();
m_m13 = m.m13();
m_m21 = m.m21();
m_m22 = m.m22();
m_m23 = m.m23();
m_m33 = m.m33();
m_dx = m.dx();
m_dy = m.dy();
m_txop = m.type();
qreal scale; qreal scale;
qt_scaleForTransform(m, &scale); qt_scaleForTransform(m, &scale);
@ -207,20 +198,10 @@ public:
QRectF controlPointRect; // only valid after endOutline() QRectF controlPointRect; // only valid after endOutline()
QT_FT_Outline m_outline; QT_FT_Outline m_outline;
uint m_txop;
int m_subpath_start; int m_subpath_start;
// Matrix QTransform m_transform;
qreal m_m11;
qreal m_m12;
qreal m_m13;
qreal m_m21;
qreal m_m22;
qreal m_m23;
qreal m_m33;
qreal m_dx;
qreal m_dy;
qreal m_curve_threshold; qreal m_curve_threshold;