Differential D8167 Diff 23812 libs/ui/input/kis_zoom_action.cpp

Changeset View

Standalone View

View Options

libs/ui/input/kis_zoom_action.cpp

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Line(s)
70 70​
71QPointF KisZoomAction::Private::centerPoint(QTouchEvent* event) 71​QPointF KisZoomAction::Private::centerPoint(QTouchEvent* event)
72{ 72​{
73 QPointF result; 73​ QPointF result;
74 int count = 0; 74​ int count = 0;
75 75​
76 Q_FOREACH (QTouchEvent::TouchPoint point, event->touchPoints()) { 76​ Q_FOREACH (QTouchEvent::TouchPoint point, event->touchPoints()) {
77 if (point.state() != Qt::TouchPointReleased) { 77​ if (point.state() != Qt::TouchPointReleased) {
78 result += point.screenPos(); 78​ result += point.pos();
79 count++; 79​ count++;
80 } 80​ }
81 } 81​ }
82 82​
83 if (count > 0) { 83​ if (count > 0) {
84 return result / count; 84​ return result / count;
85 } else { 85​ } else {
86 return QPointF(); 86​ return QPointF();
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Line(s)202 case QEvent::TouchUpdate: {
204 QPointF center = d->centerPoint(tevent); 204​ QPointF center = d->centerPoint(tevent);
205 205​
206 int count = 0; 206​ int count = 0;
207 float dist = 0.0f; 207​ float dist = 0.0f;
208 Q_FOREACH (const QTouchEvent::TouchPoint &point, tevent->touchPoints()) { 208​ Q_FOREACH (const QTouchEvent::TouchPoint &point, tevent->touchPoints()) {
209 if (point.state() != Qt::TouchPointReleased) { 209​ if (point.state() != Qt::TouchPointReleased) {
210 count++; 210​ count++;
211 211​
212 dist += (point.screenPos() - center).manhattanLength(); 212​ dist += (point.pos() - center).manhattanLength();
213 } 213​ }
214 } 214​ }
215 215​
216 dist /= count; 216​ dist /= count;
217 float delta = qFuzzyCompare(1.0f, 1.0f + d->lastDistance) ? 1.f : dist / d->lastDistance; 217​ float delta = qFuzzyCompare(1.0f, 1.0f + d->lastDistance) ? 1.f : dist / d->lastDistance;
218 218​
219 if(qAbs(delta) > 0.1f) { 219​ if(qAbs(delta) > 0.1f) {
220 qreal zoom = inputManager()->canvas()->viewManager()->zoomController()->zoomAction()->effectiveZoom(); 220​ qreal zoom = inputManager()->canvas()->viewManager()->zoomController()->zoomAction()->effectiveZoom();
▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines