AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Consistently check for nullptr in QGraphicsTextItem::inputMethodQuery"

Browse Source
This commit is contained in:
Volker Hilsheimer 2021-03-17 15:26:11 +01:00 committed by Qt CI Bot
commit 8f2f70a8ff
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/graphicsview/qgraphicsitem.cpp
View File

@ -10311,14 +10311,16 @@ QVariant QGraphicsTextItem::inputMethodQuery(Qt::InputMethodQuery query) const
v = int(inputMethodHints());
else if (dd->control)
v = dd->control->inputMethodQuery(query, QVariant());
if (v.userType() == QMetaType::QRectF)
v = v.toRectF().translated(-dd->controlOffset());
else if (v.userType() == QMetaType::QPointF)
v = v.toPointF() - dd->controlOffset();
else if (v.userType() == QMetaType::QRect)
v = v.toRect().translated(-dd->controlOffset().toPoint());
else if (v.userType() == QMetaType::QPoint)
v = v.toPoint() - dd->controlOffset().toPoint();
if (dd->control) {
if (v.userType() == QMetaType::QRectF)
v = v.toRectF().translated(-dd->controlOffset());
else if (v.userType() == QMetaType::QPointF)
v = v.toPointF() - dd->controlOffset();
else if (v.userType() == QMetaType::QRect)
v = v.toRect().translated(-dd->controlOffset().toPoint());
else if (v.userType() == QMetaType::QPoint)
v = v.toPoint() - dd->controlOffset().toPoint();
}
return v;
}