Differential D12626 Diff 35366 src/QuickEditor/QuickEditor.cpp

Changeset View

Standalone View

View Options

src/QuickEditor/QuickEditor.cpp

Show All 15 Lines
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, 16​ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17​ * Boston, MA 02110-1301, USA.
18 */ 18​ */
19 19​
20#include "QuickEditor.h" 20​#include "QuickEditor.h"
21 21​
22#include "SpectacleConfig.h" 22​#include "SpectacleConfig.h"
23 23​
24#include <KDeclarative/KDeclarative> 24​const qreal QuickEditor::mouseAreaSize = 20.0;
25#include <kdeclarative_version.h> 25​const qreal QuickEditor::cornerHandleRadius = 8.0;
26​const qreal QuickEditor::midHandleRadius = 5.0;
27​const int QuickEditor::selectionSizeThreshold = 100;
28​
29​const int QuickEditor::selectionBoxPaddingX = 5;
30​const int QuickEditor::selectionBoxPaddingY = 4;
31​const int QuickEditor::selectionBoxMarginY = 2;
32​
33​const int QuickEditor::bottomHelpBoxPaddingX = 12;
34​const int QuickEditor::bottomHelpBoxPaddingY = 8;
35​const int QuickEditor::bottomHelpBoxPairSpacing = 6;
36​const int QuickEditor::bottomHelpBoxLineHeight = 24;
26 37​
ngrahamUnsubmitted
Done

Hmm, we still can't find a better way to handle this? I'm not sure if this text is really translatable in its current state.

ngraham: Hmm, we still can't find a better way to handle this? I'm not sure if this text is really…
abalajiAuthorUnsubmitted
Done

@ngraham I'm working on a better way to do this

abalaji: @ngraham I'm working on a better way to do this
27#include <QPixmap> 38​QuickEditor::QuickEditor(const QPixmap& pixmap, QObject* parent) :
28#include <QQuickImageProvider> 39​ mMaskColour(QColor::fromRgbF(0, 0, 0, 0.15)),
29#include <QQuickItem> 40​ mStrokeColour(palette().highlight().color()),
30#include <QQuickItemGrabResult> 41​ mLabelBackgroundColour(QColor::fromRgbF(
31#include <QQuickView> 42​ palette().light().color().redF(),
32#include <QSize> 43​ palette().light().color().greenF(),
44​ palette().light().color().blueF(),
ngrahamUnsubmitted
Done

There's a special way we handle markup and line breaks in strings; change i18n("some\ntext") to xi18nc("@info", "some<nl/>text")

For more info, see https://api.kde.org/frameworks/ki18n/html/prg_guide.html#kuit_markup

ngraham: There's a special way we handle markup and line breaks in strings; change `i18n("some\ntext")`…
45​ 0.85
46​ )),
47​ mLabelForegroundColour(palette().windowText().color()),
48​ mMidHelpText(tr("Click and drag to draw a selection rectangle,\nor press Esc to quit")),
broulikUnsubmitted
Done

Use i18n() from KLocalizedString

broulik: Use `i18n()` from `KLocalizedString`
49​ mMidHelpTextFont(font()),
50​ mBottomHelpText({
ngrahamUnsubmitted
Done

What are all these &nbsp;s for? This seems like the wrong way to do whatever you're trying to do here.

ngraham: What are all these `&nbsp;`s for? This seems like the wrong way to do whatever you're trying to…
abalajiAuthorUnsubmitted
Done

I'm using QStaticText for performance so the text layout information is not recalculated with each paint. As it turns out, the only way to easily accomplish linebreaks with QStaticText is using rich-text and <br>, but QStaticText with rich-text has a weird issue where it considers the width of everything before the first <br> (the first line) to be the maximum width for the entire piece of text, and thus wraps the text on each subsequent line to fit this width. I'm using non-breaking spaces to force it to put them on a single line. Try getting rid of all the &nbsp;'s and you'll see what I mean. I'll try and figure out a different solution for this.

abalaji: I'm using `QStaticText` for performance so the text layout information is not recalculated with…
51​ {QStaticText(tr("Enter, double-click:")), QStaticText(tr("Take screenshot"))},
52​ {QStaticText(tr("Shift:")), QStaticText(tr("Hold to toggle magnifier"))},
53​ {QStaticText(tr("Right-click:")), QStaticText(tr("Reset selection"))},
54​ {QStaticText(tr("Esc:")), QStaticText(tr("Cancel"))},
55​ }),
ngrahamUnsubmitted
Done

All of this text needs to be translated; use i18n() like Kai indicated.

ngraham: All of this text needs to be translated; use `i18n()` like Kai indicated.
56​ mBottomHelpTextFont(font()),
57​ mBottomHelpGridLeftWidth(0),
58​ mMouseDragState(MouseState::None),
59​ mPixmap(pixmap)
60​{
61​ Q_UNUSED(parent);
62​
ngrahamUnsubmitted
Done

This is missing everything about the arrow keys.

ngraham: This is missing everything about the arrow keys.
abalajiAuthorUnsubmitted
Done

Sure, on it

abalaji: Sure, on it
63​ SpectacleConfig *config = SpectacleConfig::instance();
64​ if (config->useLightRegionMaskColour()) {
65​ mMaskColour = QColor(255, 255, 255, 100);
66​ }
33 67​
34struct QuickEditor::ImageStore : public QQuickImageProvider 68​ setMouseTracking(true);
69​ setAttribute(Qt::WA_StaticContents);
70​ setWindowFlags(Qt::WindowStaysOnTopHint);
71​ setAttribute(Qt::WA_TranslucentBackground);
72​ showFullScreen();
broulikUnsubmitted
Done

Call QWidget constructor:

QuickEditor::QuickEditor(const QPixmap &pixmap, QWidget *parent) : QWidget(parent)
broulik: Call `QWidget` constructor: ``` QuickEditor::QuickEditor(const QPixmap &pixmap, QWidget…
73​
74​ dprI = 1.0 / devicePixelRatioF();
75​ setGeometry(0, 0, mPixmap.width() * dprI, mPixmap.height() * dprI);
76​
77​ if (config->rememberLastRectangularRegion()) {
78​ QRect cropRegion = config->cropRegion();
79​ if (!cropRegion.isEmpty()) {
80​ mSelection = QRectF(
81​ cropRegion.x() * dprI,
ngrahamUnsubmitted
Done

If we can make the full-screen overlay window not always stay on top (i.e. you can alt-tab out of it or switch virtual desktops while it's open) then that would probably be sufficient to fully fix https://bugs.kde.org/show_bug.cgi?id=374009 in conjunction with existing improvements that this patch provides.

ngraham: If we can make the full-screen overlay window not always stay on top (i.e. you can alt-tab out…
82​ cropRegion.y() * dprI,
83​ cropRegion.width() * dprI,
84​ cropRegion.height() * dprI
85​ ).intersected(geometry());
86​ }
87​ setMouseCursor(QCursor::pos());
88​ } else {
89​ setCursor(Qt::CrossCursor);
90​ }
91​
92​ mMidHelpTextFont.setPointSize(12);
93​
94​ for (auto& pair : mBottomHelpText) {
95​ for (auto item : { pair.first, pair.second }) {
96​ item.prepare(QTransform(), mBottomHelpTextFont);
97​ item.setPerformanceHint(QStaticText::AggressiveCaching);
ngrahamUnsubmitted
Done

Don't hardcode font sizes

ngraham: Don't hardcode font sizes
98​ }
99​ }
100​ layoutBottomHelpText();
101​
102​ update();
103​}
104​
105​void QuickEditor::acceptSelection()
35{ 106​{
36 ImageStore(const QPixmap &pixmap) : 107​ if (!mSelection.isEmpty()) {
37 QQuickImageProvider(QQuickImageProvider::Pixmap), 108​ const qreal dpr = devicePixelRatioF();
38 mPixmap(pixmap) 109​ QRect scaledCropRegion = QRect(
39 {} 110​ qRound(mSelection.x() * dpr),
111​ qRound(mSelection.y() * dpr),
112​ qRound(mSelection.width() * dpr),
113​ qRound(mSelection.height() * dpr)
114​ );
115​ SpectacleConfig::instance()->setCropRegion(scaledCropRegion);
116​ emit grabDone(mPixmap.copy(scaledCropRegion));
117​ delete this;
118​ }
119​}
40 120​
41 QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE 121​void QuickEditor::keyPressEvent(QKeyEvent* event)
42 { 122​{
43 Q_UNUSED(id); 123​ switch(event->key()) {
124​ case Qt::Key_Escape:
125​ emit grabCancelled();
126​ delete this;
broulikUnsubmitted
Done

Can this be done by the user of this class? Self-deletion is typically not a good idea

broulik: Can this be done by the user of this class? Self-deletion is typically not a good idea
abalajiAuthorUnsubmitted
Done

Yeah this is stupid, I'll fix it

abalaji: Yeah this is stupid, I'll fix it
127​ break;
128​ case Qt::Key_Return:
129​ case Qt::Key_Enter:
130​ acceptSelection();
131​ default:
132​ break;
133​ }
134​}
135​
136​void QuickEditor::mousePressEvent(QMouseEvent* event)
137​{
138​ if (event->button() & Qt::LeftButton) {
139​ const QPointF& pos = event->screenPos();
140​ mMouseDragState = whereIsTheMouse(pos);
141​ switch(mMouseDragState) {
142​ case MouseState::Outside:
143​ mStartPos = pos;
144​ break;
145​ case MouseState::Inside:
146​ mStartPos = pos;
147​ mInitialTopLeft = mSelection.topLeft();
148​ setCursor(Qt::ClosedHandCursor);
149​ break;
150​ case MouseState::Top:
151​ case MouseState::Left:
152​ case MouseState::TopLeft:
153​ mStartPos = mSelection.bottomRight();
154​ break;
155​ case MouseState::Bottom:
156​ case MouseState::Right:
157​ case MouseState::BottomRight:
158​ mStartPos = mSelection.topLeft();
159​ break;
160​ case MouseState::TopRight:
161​ mStartPos = mSelection.bottomLeft();
162​ break;
163​ case MouseState::BottomLeft:
164​ mStartPos = mSelection.topRight();
165​ default:
166​ break;
167​ }
168​ }
169​ event->accept();
170​}
44 171​
45 if (size) { 172​void QuickEditor::mouseMoveEvent(QMouseEvent* event)
46 *size = mPixmap.size(); 173​{
174​ const QPointF& pos = event->screenPos();
175​ switch (mMouseDragState) {
176​ case MouseState::None: {
177​ setMouseCursor(pos);
178​ break;
179​ }
180​ case MouseState::TopLeft:
181​ case MouseState::TopRight:
182​ case MouseState::BottomRight:
183​ case MouseState::BottomLeft: {
184​ const bool afterX = pos.x() >= mStartPos.x();
185​ const bool afterY = pos.y() >= mStartPos.y();
186​ mSelection.setRect(
187​ afterX ? mStartPos.x() : pos.x(),
188​ afterY ? mStartPos.y() : pos.y(),
189​ qAbs(pos.x() - mStartPos.x()) + (afterX ? dprI : 0),
190​ qAbs(pos.y() - mStartPos.y()) + (afterY ? dprI : 0)
191​ );
192​ update();
193​ break;
194​ }
195​ case MouseState::Outside: {
196​ mSelection.setRect(
197​ qMin(pos.x(), mStartPos.x()),
198​ qMin(pos.y(), mStartPos.y()),
199​ qAbs(pos.x() - mStartPos.x()) + dprI,
200​ qAbs(pos.y() - mStartPos.y()) + dprI
201​ );
202​ update();
203​ break;
204​ }
205​ case MouseState::Top:
206​ case MouseState::Bottom: {
207​ const bool afterY = pos.y() >= mStartPos.y();
208​ mSelection.setRect(
209​ mSelection.x(),
210​ afterY ? mStartPos.y() : pos.y(),
211​ mSelection.width(),
212​ qAbs(pos.y() - mStartPos.y()) + (afterY ? dprI : 0)
213​ );
214​ update();
215​ break;
216​ }
217​ case MouseState::Right:
218​ case MouseState::Left: {
219​ const bool afterX = pos.x() >= mStartPos.x();
220​ mSelection.setRect(
221​ afterX ? mStartPos.x() : pos.x(),
222​ mSelection.y(),
223​ qAbs(pos.x() - mStartPos.x()) + (afterX ? dprI : 0),
224​ mSelection.height()
225​ );
226​ update();
227​ break;
228​ }
229​ case MouseState::Inside: {
230​ // We use some math here to figure out if the diff with which we
231​ // move the rectangle with moves it out of bounds,
232​ // in which case we adjust the diff to not let that happen
233​
234​ const qreal dpr = devicePixelRatioF();
235​ // new top left point of the rectangle
236​ QPoint newTopLeft = ((pos - mStartPos + mInitialTopLeft) * dpr).toPoint();
237​
238​ // the max coordinates of the top left point
239​ const int realMaxX = qRound((width() - mSelection.width()) * dpr);
240​ const int realMaxY = qRound((height() - mSelection.height()) * dpr);
241​
242​ if (newTopLeft.x() < 0) {
243​ // tweak startPos to prevent rectangle from getting stuck
244​ mStartPos.setX(mStartPos.x() + newTopLeft.x() * dprI);
245​ newTopLeft.setX(0);
246​ } else {
247​ const int xOffset = newTopLeft.x() - realMaxX;
248​ if (xOffset > 0) {
249​ mStartPos.setX(mStartPos.x() + xOffset * dprI);
250​ newTopLeft.setX(realMaxX);
251​ }
47 } 252​ }
48 253​
49 if (requestedSize.isEmpty()) { 254​ if (newTopLeft.y() < 0) {
50 return mPixmap; 255​ mStartPos.setY(mStartPos.y() + newTopLeft.y() * dprI);
256​ newTopLeft.setY(0);
257​ } else {
258​ const int yOffset = newTopLeft.y() - realMaxY;
259​ if (yOffset > 0) {
260​ mStartPos.setY(mStartPos.y() + yOffset * dprI);
261​ newTopLeft.setY(realMaxY);
262​ }
51 } 263​ }
52 264​
53 return mPixmap.scaled(requestedSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); 265​ const auto newTopLeftF = QPointF(newTopLeft) * dprI;
266​
267​ mSelection.moveTo(newTopLeftF);
268​ update();
269​ }
270​ default:
271​ break;
54 } 272​ }
55 273​
56 QPixmap mPixmap; 274​ event->accept();
57}; 275​}
58 276​
59struct QuickEditor::QuickEditorPrivate 277​void QuickEditor::mouseReleaseEvent(QMouseEvent* event)
60{ 278​{
61 KDeclarative::KDeclarative *mDecl; 279​ const auto button = event->button();
62 QQuickView *mQuickView; 280​ if (button == Qt::LeftButton && mMouseDragState == MouseState::Inside) {
63 QQmlEngine *mQmlEngine; 281​ setCursor(Qt::OpenHandCursor);
64 QRect mGrabRect; 282​ } else if (button == Qt::RightButton) {
65 QSharedPointer<QQuickItemGrabResult> mCurrentGrabResult; 283​ mSelection.setWidth(0);
66}; 284​ mSelection.setHeight(0);
285​ }
286​ event->accept();
287​ mMouseDragState = MouseState::None;
288​ update();
289​}
67 290​
68QuickEditor::QuickEditor(const QPixmap &pixmap, QObject *parent) : 291​void QuickEditor::mouseDoubleClickEvent(QMouseEvent* event)
69 QObject(parent), 292​{
70 mImageStore(new ImageStore(pixmap)), 293​ event->accept();
71 d_ptr(new QuickEditorPrivate) 294​ if (event->button() == Qt::LeftButton && mSelection.contains(event->pos())) {
72{ 295​ acceptSelection();
73 Q_D(QuickEditor); 296​ }
74 297​}
75 d->mQmlEngine = new QQmlEngine(); ​
76 d->mDecl = new KDeclarative::KDeclarative; ​
77 d->mDecl->setDeclarativeEngine(d->mQmlEngine); ​
78 ​
79#if KDECLARATIVE_VERSION >= QT_VERSION_CHECK(5, 45, 0) ​
80 d->mDecl->setupEngine(d->mQmlEngine); ​
81 d->mDecl->setupContext(); ​
82#else ​
83 d->mDecl->setupBindings(); ​
84#endif ​
85 ​
86 d->mQmlEngine->addImageProvider(QStringLiteral("snapshot"), mImageStore); ​
87 ​
88 d->mQuickView = new QQuickView(d->mQmlEngine, 0); ​
89 d->mQuickView->setClearBeforeRendering(false); ​
90 d->mQuickView->setSource(QUrl(QStringLiteral("qrc:///QuickEditor/EditorRoot.qml"))); ​
91 ​
92 d->mQuickView->setFlags(Qt::BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Tool); ​
93 d->mQuickView->setGeometry(0, 0, pixmap.width(), pixmap.height()); ​
94 d->mQuickView->showFullScreen(); ​
95 ​
96 // connect up the signals ​
97 QQuickItem *rootItem = d->mQuickView->rootObject(); ​
98 connect(rootItem, SIGNAL(acceptImage(int, int, int, int)), this, SLOT(acceptImageHandler(int, int, int, int))); ​
99 connect(rootItem, SIGNAL(cancelImage()), this, SIGNAL(grabCancelled())); ​
100 298​
101 // set up initial config 299​void QuickEditor::paintEvent(QPaintEvent*)
102 SpectacleConfig *config = SpectacleConfig::instance(); 300​{
103 if (config->rememberLastRectangularRegion()) { 301​ QPainter painter(this);
104 auto pixelRatio = d->mQuickView->devicePixelRatio(); 302​ painter.setRenderHints(QPainter::Antialiasing);
105 QRect cropRegion = config->cropRegion(); 303​ QBrush brush(mPixmap);
106 if (!cropRegion.isEmpty()) { 304​ brush.setTransform(QTransform().scale(dprI, dprI));
107 QMetaObject::invokeMethod( 305​ painter.setBackground(brush);
108 rootItem, "setInitialSelection", 306​ painter.eraseRect(geometry());
109 Q_ARG(QVariant, cropRegion.x() / pixelRatio), 307​ if (!mSelection.size().isEmpty() || mMouseDragState != MouseState::None) {
110 Q_ARG(QVariant, cropRegion.y() / pixelRatio), 308​ painter.fillRect(mSelection, mStrokeColour);
111 Q_ARG(QVariant, cropRegion.width() / pixelRatio), 309​ const QRectF innerRect = mSelection.adjusted(1, 1, -1, -1);
112 Q_ARG(QVariant, cropRegion.height() / pixelRatio) 310​ if (innerRect.width() > 0 && innerRect.height() > 0) {
113 ); 311​ painter.eraseRect(mSelection.adjusted(1, 1, -1, -1));
114 } 312​ }
313​
314​ QRectF top(0, 0, width(), mSelection.top());
315​ QRectF right(mSelection.right(), mSelection.top(), width() - mSelection.right(), mSelection.height());
316​ QRectF bottom(0, mSelection.bottom(), width(), height() - mSelection.bottom());
317​ QRectF left(0, mSelection.top(), mSelection.left(), mSelection.height());
318​ for (auto& rect : { top, right, bottom, left }) {
319​ painter.fillRect(rect, mMaskColour);
115 } 320​ }
116 321​
117 rootItem->setProperty("showMagnifier", config->showMagnifierChecked()); 322​ drawSelectionSizeTooltip(painter);
323​ if (mMouseDragState == MouseState::None) { // mouse is up
324​ if ((mSelection.width() > 20) && (mSelection.height() > 20)) {
325​ drawDragHandles(painter);
326​ }
118 327​
119 if (config->useLightRegionMaskColour()) { ​
120 rootItem->setProperty("maskColour", QColor(255, 255, 255, 100)); ​
121 } 328​ }
329​ drawBottomHelpText(painter);
330​ } else {
331​ drawMidHelpText(painter);
332​ }
333​}
334​
335​void QuickEditor::layoutBottomHelpText()
336​{
337​ int mMaxRightWidth = 0;
broulikUnsubmitted
Done

Use braces even for single-line statements

if (...) {
    return;
}
broulik: Use braces even for single-line statements ``` if (...) { return; } ```
338​ int contentWidth = 0;
339​ int contentHeight = 0;
340​ mBottomHelpGridLeftWidth = 0;
341​ for (auto& item : mBottomHelpText) {
342​ auto& left = item.first;
343​ auto& right = item.second;
344​ const auto leftSize = left.size().toSize();
345​ const auto rightSize = right.size().toSize();
346​ mBottomHelpGridLeftWidth = qMax(mBottomHelpGridLeftWidth, leftSize.width());
347​ mMaxRightWidth = qMax(mMaxRightWidth, rightSize.width());
348​ contentWidth = qMax(contentWidth, mBottomHelpGridLeftWidth + mMaxRightWidth + bottomHelpBoxPairSpacing);
349​ contentHeight += bottomHelpBoxLineHeight;
broulikUnsubmitted
Done

const auto &

broulik: `const auto &`
350​ }
351​ mBottomHelpContentPos.setX((width() - contentWidth) / 2);
352​ mBottomHelpContentPos.setY(height() - contentHeight - 8);
353​ mBottomHelpGridLeftWidth += mBottomHelpContentPos.x();
354​ mBottomHelpBorderBox.setRect(
355​ mBottomHelpContentPos.x() - bottomHelpBoxPaddingX,
356​ mBottomHelpContentPos.y() - bottomHelpBoxPaddingY,
357​ contentWidth + bottomHelpBoxPaddingX * 2,
358​ contentHeight + bottomHelpBoxPaddingY * 2 - 1
359​ );
122} 360​}
123 361​
124QuickEditor::~QuickEditor() 362​void QuickEditor::drawBottomHelpText(QPainter &painter)
125{ 363​{
126 Q_D(QuickEditor); 364​ if (mSelection.intersects(mBottomHelpBorderBox)) return;
127 delete d->mQuickView; ​
128 delete d->mDecl; ​
129 delete d->mQmlEngine; ​
130 365​
131 delete d_ptr; 366​ painter.setBrush(mLabelBackgroundColour);
367​ painter.setPen(mLabelForegroundColour);
368​ painter.setFont(mBottomHelpTextFont);
369​ painter.setRenderHint(QPainter::Antialiasing, false);
370​ painter.drawRect(mBottomHelpBorderBox);
371​ painter.setRenderHint(QPainter::Antialiasing, true);
372​
373​ int topOffset = mBottomHelpContentPos.y();
374​ for (auto& item : mBottomHelpText) {
375​ auto& left = item.first;
376​ auto& right = item.second;
377​ const auto leftSize = left.size().toSize();
378​ const auto drawY = topOffset + (bottomHelpBoxLineHeight - leftSize.height()) / 2;
379​ painter.drawStaticText(mBottomHelpGridLeftWidth - leftSize.width(), drawY, left);
380​ painter.drawStaticText(mBottomHelpGridLeftWidth + bottomHelpBoxPairSpacing, drawY, right);
381​ topOffset += bottomHelpBoxLineHeight;
382​ }
132} 383​}
133 384​
134void QuickEditor::acceptImageHandler(int x, int y, int width, int height) 385​void QuickEditor::drawDragHandles(QPainter& painter)
135{ 386​{
136 Q_D(QuickEditor); 387​ const qreal leftX = mSelection.x();
388​ const qreal width = mSelection.width();
389​ const qreal centerX = leftX + width / 2.0;
390​ const qreal rightX = leftX + width;
391​
392​ const qreal topY = mSelection.y();
393​ const qreal height = mSelection.height();
394​ const qreal centerY = topY + height / 2.0;
395​ const qreal bottomY = topY + height;
396​
397​ // start a path
398​ QPainterPath path;
399​
400​ const qreal cornerHandleDiameter = 2 * cornerHandleRadius;
401​ // top-left handle
402​ path.moveTo(leftX, topY);
403​ path.arcTo(leftX - cornerHandleRadius, topY - cornerHandleRadius, cornerHandleDiameter, cornerHandleDiameter, 0, -90);
404​
405​ // top-right handle
406​ path.moveTo(rightX, topY);
407​ path.arcTo(rightX - cornerHandleRadius, topY - cornerHandleRadius, cornerHandleDiameter, cornerHandleDiameter, 180, 90);
408​
409​ // bottom-left handle
410​ path.moveTo(leftX, bottomY);
411​ path.arcTo(leftX - cornerHandleRadius, bottomY - cornerHandleRadius, cornerHandleDiameter, cornerHandleDiameter, 0, 90);
412​
413​ // bottom-right handle
414​ path.moveTo(rightX, bottomY);
415​ path.arcTo(rightX - cornerHandleRadius, bottomY - cornerHandleRadius, cornerHandleDiameter, cornerHandleDiameter, 180, -90);
416​
417​ const qreal midHandleDiameter = 2 * midHandleRadius;
418​ // top-center handle
419​ path.moveTo(centerX, topY);
420​ path.arcTo(centerX - midHandleRadius, topY - midHandleRadius, midHandleDiameter, midHandleDiameter, 0, -180);
421​
422​ // right-center handle
423​ path.moveTo(rightX, centerY);
424​ path.arcTo(rightX - midHandleRadius, centerY - midHandleRadius, midHandleDiameter, midHandleDiameter, 90, 180);
425​
426​ // bottom-center handle
427​ path.moveTo(centerX, bottomY);
428​ path.arcTo(centerX - midHandleRadius, bottomY - midHandleRadius, midHandleDiameter, midHandleDiameter, 0, 180);
429​
430​ // left-center handle
431​ path.moveTo(leftX, centerY);
432​ path.arcTo(leftX - midHandleRadius, centerY - midHandleRadius, midHandleDiameter, midHandleDiameter, 90, -180);
137 433​
138 if ((x == -1) && (y == -1) && (width == -1) && (height == -1)) { 434​ // draw the path
139 SpectacleConfig::instance()->setCropRegion(QRect()); 435​ painter.fillPath(path, mStrokeColour);
140 emit grabCancelled(); ​
141 return; ​
142 } 436​}
143 437​
144 auto pixelRatio = d->mQuickView->devicePixelRatio(); 438​void QuickEditor::drawMidHelpText(QPainter &painter)
145 d->mGrabRect = QRect(x * pixelRatio, y * pixelRatio, width * pixelRatio, height * pixelRatio); 439​{
146 SpectacleConfig::instance()->setCropRegion(d->mGrabRect); 440​ painter.fillRect(geometry(), mMaskColour);
441​ painter.setFont(mMidHelpTextFont);
442​ QRect textSize = painter.boundingRect(QRect(), Qt::AlignCenter, mMidHelpText);
443​ QPoint pos((width() - textSize.width()) / 2, (height() - textSize.height()) / 2);
444​
445​ painter.setBrush(mLabelBackgroundColour);
446​ QPen pen(mLabelForegroundColour);
447​ pen.setWidth(2);
448​ painter.setPen(pen);
449​ painter.drawRoundedRect(QRect(pos.x() - 20, pos.y() - 20, textSize.width() + 40, textSize.height() + 40), 4, 4);
450​
451​ painter.setCompositionMode(QPainter::CompositionMode_Source);
452​ painter.drawText(QRect(pos, textSize.size()), Qt::AlignCenter, mMidHelpText);
453​}
454​
455​void QuickEditor::drawSelectionSizeTooltip(QPainter &painter)
456​{
457​ // Set the selection size and finds the most appropriate position:
458​ // - vertically centered inside the selection if the box is not covering the a large part of selection
459​ // - on top of the selection if the selection x position fits the box height plus some margin
460​ // - at the bottom otherwise
461​ const qreal dpr = devicePixelRatioF();
462​ QString selectionSizeText = QString(tr("%1x%2")).arg(qRound(mSelection.width() * dpr)).arg(qRound(mSelection.height() * dpr));
463​ const QRect selectionSizeTextRect = painter.boundingRect(QRect(), 0, selectionSizeText);
464​
465​ const int selectionBoxWidth = selectionSizeTextRect.width() + selectionBoxPaddingX * 2;
466​ const int selectionBoxHeight = selectionSizeTextRect.height() + selectionBoxPaddingY * 2;
467​ const int selectionBoxX = qBound(
468​ 0,
469​ static_cast<int>(mSelection.x()) + (static_cast<int>(mSelection.width()) - selectionSizeTextRect.width()) / 2 - selectionBoxPaddingX,
470​ width() - selectionBoxWidth
471​ );
472​ qreal selectionBoxY;
473​ if ((mSelection.width() > selectionSizeThreshold) && (mSelection.height() > selectionSizeThreshold)) {
474​ // show inside the box
475​ selectionBoxY = mSelection.y() + (mSelection.height() - selectionSizeTextRect.height()) / 2;
476​ } else {
477​ // show on top by default
478​ selectionBoxY = mSelection.y() - selectionBoxHeight - selectionBoxMarginY;
479​ if (selectionBoxY < 0) {
480​ // show at the bottom
481​ selectionBoxY = mSelection.y() + mSelection.height() + selectionBoxMarginY;
482​ }
483​ }
484​
485​ // Now do the actual box, border, and text drawing
486​ painter.setBrush(mLabelBackgroundColour);
487​ painter.setPen(mLabelForegroundColour);
488​ const QRect selectionBoxRect(
489​ selectionBoxX,
490​ selectionBoxY,
491​ selectionBoxWidth,
492​ selectionBoxHeight
493​ );
494​
495​ painter.setRenderHint(QPainter::Antialiasing, false);
496​ painter.drawRect(selectionBoxRect);
497​ painter.setRenderHint(QPainter::Antialiasing, true);
498​ painter.drawText(selectionBoxRect, Qt::AlignCenter, selectionSizeText);
499​}
147 500​
148 d->mQuickView->hide(); 501​void QuickEditor::setMouseCursor(const QPointF& pos)
149 emit grabDone(mImageStore->mPixmap.copy(d->mGrabRect), d->mGrabRect); 502​{
503​ MouseState mouseState = whereIsTheMouse(pos);
504​ if (mouseState == MouseState::Outside) {
505​ setCursor(Qt::CrossCursor);
506​ } else if (MouseState::TopLeftOrBottomRight & mouseState) {
507​ setCursor(Qt::SizeFDiagCursor);
508​ } else if (MouseState::TopRightOrBottomLeft & mouseState) {
509​ setCursor(Qt::SizeBDiagCursor);
510​ } else if (MouseState::TopOrBottom & mouseState) {
511​ setCursor(Qt::SizeVerCursor);
512​ } else if (MouseState::RightOrLeft & mouseState) {
513​ setCursor(Qt::SizeHorCursor);
514​ } else {
515​ setCursor(Qt::OpenHandCursor);
516​ }
517​}
518​
519​QuickEditor::MouseState QuickEditor::whereIsTheMouse(const QPointF& pos)
520​{
521​ if (mSelection.contains(pos)) {
522​ const qreal verSize = qMin(mouseAreaSize, mSelection.height() / 2);
523​ const qreal horSize = qMin(mouseAreaSize, mSelection.width() / 2);
guotaoUnsubmitted
Done

should divde by 3, not 2, when adjust very small rectangle

guotao: should divde by 3, not 2, when adjust very small rectangle
abalajiAuthorUnsubmitted
Done

True, makes sense. Then we would actually be able to move the rectangle around when it's small.

abalaji: True, makes sense. Then we would actually be able to move the rectangle around when it's small.
524​
525​ auto withinThreshold = [](const qreal offset, const qreal size) {
526​ return offset <= size && offset >= 0;
527​ };
528​
529​ const bool withinTopEdge = withinThreshold(pos.y() - mSelection.top(), verSize);
530​ const bool withinRightEdge = withinThreshold(mSelection.right() - pos.x(), horSize);
531​ const bool withinBottomEdge = !withinTopEdge && withinThreshold(mSelection.bottom() - pos.y(), verSize);
532​ const bool withinLeftEdge = !withinRightEdge && withinThreshold(pos.x() - mSelection.left(), horSize);
533​
534​ if (withinTopEdge) {
535​ if (withinRightEdge) {
536​ return MouseState::TopRight;
537​ } else if (withinLeftEdge) {
538​ return MouseState::TopLeft;
539​ } else {
540​ return MouseState::Top;
541​ }
542​ } else if (withinBottomEdge) {
543​ if (withinRightEdge) {
544​ return MouseState::BottomRight;
545​ } else if (withinLeftEdge) {
546​ return MouseState::BottomLeft;
547​ } else {
548​ return MouseState::Bottom;
549​ }
550​ } else if (withinRightEdge) {
551​ return MouseState::Right;
552​ } else if (withinLeftEdge) {
553​ return MouseState::Left;
554​ } else {
555​ return MouseState::Inside;
556​ }
557​ } else {
558​ return MouseState::Outside;
559​ }
150} 560​}