Differential D12626 Diff 33517 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 int QuickEditor::mouseAreaSize = 20;
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​ mStrokeColor(QColor::fromRgbF(0.114, 0.6, 0.953, 1)),
30#include <QQuickItemGrabResult> 41​ mMidHelpText(tr("Click anywhere on the screen (including here) to start drawing a selection rectangle, \nor press Esc to quit")),
31#include <QQuickView> 42​ mMidHelpTextFont(font()),
32#include <QSize> 43​ mBottomHelpText({
44​ {QStaticText(tr("Enter, double-click:")), QStaticText(tr("Take screenshot"))},
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​ {QStaticText(tr("Shift:")), QStaticText(tr("Hold to toggle magnifier"))},
46​ {QStaticText(tr("Right-click:")), QStaticText(tr("Reset selection"))},
47​ {QStaticText(tr("Esc:")), QStaticText(tr("Cancel"))},
48​ }),
broulikUnsubmitted
Done

Use i18n() from KLocalizedString

broulik: Use `i18n()` from `KLocalizedString`
49​ mBottomHelpTextFont(font()),
50​ mBottomHelpBorderBox(QRect()),
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​ mBottomHelpContentPos(QPoint()),
52​ mBottomHelpGridLeftWidth(0),
53​ mMouseDragState(MouseState::None),
54​ mPixmap(pixmap)
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​ Q_UNUSED(parent);
57​
58​ SpectacleConfig *config = SpectacleConfig::instance();
59​ if (config->useLightRegionMaskColour()) {
60​ mMaskColour = QColor(255, 255, 255, 100);
61​ mStrokeColor = QColor(96, 96, 96, 255);
62​ }
broulikUnsubmitted
Done

Call QWidget constructor:

QuickEditor::QuickEditor(const QPixmap &pixmap, QWidget *parent) : QWidget(parent)
broulik: Call `QWidget` constructor: ``` QuickEditor::QuickEditor(const QPixmap &pixmap, QWidget…
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​
64​ setMouseTracking(true);
65​ setAttribute(Qt::WA_StaticContents);
66​ setWindowFlags(Qt::WindowStaysOnTopHint);
67​ setAttribute(Qt::WA_TranslucentBackground);
68​ showFullScreen();
69​
70​ const qreal dpr = devicePixelRatioF();
71​ setGeometry(0, 0, mPixmap.width() / dpr, mPixmap.height() / dpr);
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…
72​
73​ if (config->rememberLastRectangularRegion()) {
74​ QRect cropRegion = config->cropRegion();
75​ if (!cropRegion.isEmpty()) {
76​ mSelection = QRect(
77​ cropRegion.x() / dpr,
78​ cropRegion.y() / dpr,
79​ cropRegion.width() / dpr,
80​ cropRegion.height() / dpr
81​ ).intersected(rect());
82​ }
83​ setMouseCursor(QCursor::pos());
84​ } else {
85​ setCursor(Qt::CrossCursor);
86​ }
33 87​
34struct QuickEditor::ImageStore : public QQuickImageProvider 88​ mMidHelpTextFont.setPointSize(12);
89​ mMidHelpText.prepare(QTransform(), mMidHelpTextFont);
90​ mMidHelpText.setPerformanceHint(QStaticText::AggressiveCaching);
91​
92​ for (auto& pair : mBottomHelpText) {
93​ for (auto item : { pair.first, pair.second }) {
94​ item.prepare(QTransform(), mBottomHelpTextFont);
95​ item.setPerformanceHint(QStaticText::AggressiveCaching);
ngrahamUnsubmitted
Done

Don't hardcode font sizes

ngraham: Don't hardcode font sizes
96​ }
97​ }
98​ layoutBottomHelpText();
99​
100​ QPalette pal = palette();
101​ setAutoFillBackground(true);
102​ pal.setBrush(QPalette::Window, Qt::transparent);
103​ setPalette(pal);
104​ update();
105​}
106​
107​inline void QuickEditor::acceptSelection()
35{ 108​{
36 ImageStore(const QPixmap &pixmap) : 109​ if (!mSelection.isEmpty()) {
37 QQuickImageProvider(QQuickImageProvider::Pixmap), 110​ const qreal dpr = devicePixelRatioF();
38 mPixmap(pixmap) 111​ QRect scaledCropRegion = QRect(
39 {} 112​ mSelection.x() * dpr,
113​ mSelection.y() * dpr,
114​ mSelection.width() * dpr,
115​ mSelection.height() * dpr
116​ );
117​ SpectacleConfig::instance()->setCropRegion(scaledCropRegion);
118​ emit grabDone(mPixmap.copy(scaledCropRegion));
119​ delete this;
120​ }
121​}
40 122​
41 QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE 123​void QuickEditor::keyPressEvent(QKeyEvent* event)
42 { 124​{
43 Q_UNUSED(id); 125​ switch(event->key()) {
126​ case Qt::Key_Escape:
127​ emit grabCancelled();
128​ 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
129​ break;
130​ case Qt::Key_Return:
131​ case Qt::Key_Enter:
132​ acceptSelection();
133​ default:
134​ break;
135​ }
136​}
44 137​
45 if (size) { 138​void QuickEditor::mousePressEvent(QMouseEvent* event)
46 *size = mPixmap.size(); 139​{
140​ if (event->button() & Qt::LeftButton) {
141​ const QPoint& pos = event->pos();
142​ mMouseDragState = whereIsTheMouse(pos);
143​ switch(mMouseDragState) {
144​ case MouseState::Outside:
145​ mStartPos = event->pos();
146​ break;
147​ case MouseState::Inside:
148​ mStartPos = event->pos();
149​ mInitialTopLeft = mSelection.topLeft();
150​ setCursor(Qt::ClosedHandCursor);
151​ break;
152​ case MouseState::Top:
153​ case MouseState::Left:
154​ case MouseState::TopLeft:
155​ mStartPos = mSelection.bottomRight();
156​ break;
157​ case MouseState::Bottom:
158​ case MouseState::Right:
159​ case MouseState::BottomRight:
160​ mStartPos = mSelection.topLeft();
161​ break;
162​ case MouseState::TopRight:
163​ mStartPos = mSelection.bottomLeft();
164​ break;
165​ case MouseState::BottomLeft:
166​ mStartPos = mSelection.topRight();
167​ default:
168​ break;
169​ }
170​ }
171​ event->accept();
47 } 172​}
48 173​
49 if (requestedSize.isEmpty()) { 174​void QuickEditor::mouseMoveEvent(QMouseEvent* event)
50 return mPixmap; 175​{
176​ const QPoint& pos = event->pos();
177​ switch (mMouseDragState) {
178​ case MouseState::None: {
179​ setMouseCursor(pos);
180​ break;
181​ }
182​ case MouseState::TopLeft:
183​ case MouseState::TopRight:
184​ case MouseState::BottomRight:
185​ case MouseState::BottomLeft:
186​ case MouseState::Outside:
187​ mSelection.setRect(
188​ qMin(pos.x(), mStartPos.x()),
189​ qMin(pos.y(), mStartPos.y()),
190​ qAbs(pos.x() - mStartPos.x()),
191​ qAbs(pos.y() - mStartPos.y())
192​ );
193​ update();
194​ break;
195​ case MouseState::Top:
196​ case MouseState::Bottom:
197​ mSelection.setRect(
198​ mSelection.x(),
199​ qMin(pos.y(), mStartPos.y()),
200​ mSelection.width(),
201​ qAbs(pos.y() - mStartPos.y())
202​ );
203​ update();
204​ break;
205​ case MouseState::Right:
206​ case MouseState::Left:
207​ mSelection.setRect(
208​ qMin(pos.x(), mStartPos.x()),
209​ mSelection.y(),
210​ qAbs(pos.x() - mStartPos.x()),
211​ mSelection.height()
212​ );
213​ update();
214​ break;
215​ case MouseState::Inside: {
216​ // We use some math here to figure out if the diff with which we
217​ // move the rectangle with moves it out of bounds,
218​ // in which case we adjust the diff to not let that happen
219​
220​ // new top left point of the rectangle
221​ QPoint newTopLeft = pos - mStartPos + mInitialTopLeft;
222​
223​ // the max coordinates of the top left point
224​ const int maxX = size().width() - mSelection.width();
225​ const int maxY = size().height() - mSelection.height();
226​
227​ if (newTopLeft.x() < 0) {
228​ // tweak startPos to prevent rectangle from getting stuck
229​ mStartPos.setX(mStartPos.x() + newTopLeft.x());
230​ newTopLeft.setX(0);
231​ } else {
232​ const int xOffset = newTopLeft.x() - maxX;
233​ if (xOffset > 0) {
234​ mStartPos.setX(mStartPos.x() + xOffset);
235​ newTopLeft.setX(maxX);
236​ }
51 } 237​ }
52 238​
53 return mPixmap.scaled(requestedSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); 239​ if (newTopLeft.y() < 0) {
240​ mStartPos.setY(mStartPos.y() + newTopLeft.y());
241​ newTopLeft.setY(0);
242​ } else {
243​ const int yOffset = newTopLeft.y() - maxY;
244​ if (yOffset > 0) {
245​ mStartPos.setY(mStartPos.y() + yOffset);
246​ newTopLeft.setY(maxY);
247​ }
54 } 248​ }
55 249​
56 QPixmap mPixmap; 250​ // only move if the newTopLeft is different from the old one
57}; 251​ newTopLeft -= mSelection.topLeft();
252​ if (!newTopLeft.isNull()) {
253​ mSelection.translate(newTopLeft);
254​ update();
255​ }
256​ }
257​ default:
258​ break;
259​ }
260​ event->accept();
261​}
58 262​
59struct QuickEditor::QuickEditorPrivate 263​void QuickEditor::mouseReleaseEvent(QMouseEvent* event)
60{ 264​{
61 KDeclarative::KDeclarative *mDecl; 265​ const auto button = event->button();
62 QQuickView *mQuickView; 266​ if (button == Qt::LeftButton && mMouseDragState == MouseState::Inside) {
63 QQmlEngine *mQmlEngine; 267​ setCursor(Qt::OpenHandCursor);
64 QRect mGrabRect; 268​ } else if (button == Qt::RightButton) {
65 QSharedPointer<QQuickItemGrabResult> mCurrentGrabResult; 269​ mSelection.setWidth(0);
66}; 270​ mSelection.setHeight(0);
271​ }
272​ event->accept();
273​ mMouseDragState = MouseState::None;
274​ update();
275​}
67 276​
68QuickEditor::QuickEditor(const QPixmap &pixmap, QObject *parent) : 277​void QuickEditor::mouseDoubleClickEvent(QMouseEvent* event)
69 QObject(parent), 278​{
70 mImageStore(new ImageStore(pixmap)), 279​ event->accept();
71 d_ptr(new QuickEditorPrivate) 280​ if (event->button() == Qt::LeftButton && mSelection.contains(event->pos())) {
72{ 281​ acceptSelection();
73 Q_D(QuickEditor); 282​ }
74 283​}
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 284​
101 // set up initial config 285​void QuickEditor::paintEvent(QPaintEvent*)
102 SpectacleConfig *config = SpectacleConfig::instance(); 286​{
103 if (config->rememberLastRectangularRegion()) { 287​ QPainter painter(this);
104 auto pixelRatio = d->mQuickView->devicePixelRatio(); 288​ painter.setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing);
105 QRect cropRegion = config->cropRegion(); 289​ const QRect& fullRect = geometry();
106 if (!cropRegion.isEmpty()) { 290​ painter.drawPixmap(fullRect, mPixmap);
107 QMetaObject::invokeMethod( 291​ if (!mSelection.size().isEmpty() || mMouseDragState != MouseState::None) {
108 rootItem, "setInitialSelection", 292​ painter.setPen(mStrokeColor);
109 Q_ARG(QVariant, cropRegion.x() / pixelRatio), 293​ painter.drawRect(mSelection);
110 Q_ARG(QVariant, cropRegion.y() / pixelRatio), 294​ painter.setClipRegion(QRegion(fullRect).subtracted(mSelection));
111 Q_ARG(QVariant, cropRegion.width() / pixelRatio), 295​ painter.fillRect(fullRect, mMaskColour);
112 Q_ARG(QVariant, cropRegion.height() / pixelRatio) 296​ painter.setClipping(false);
113 ); 297​
298​ drawSelectionSizeTooltip(painter);
299​ if (mMouseDragState == MouseState::None) { // mouse is up
300​ if ((mSelection.width() > 20) && (mSelection.height() > 20)) {
301​ drawDragHandles(painter);
302​ }
303​
304​ drawBottomHelpText(painter);
305​ }
306​ } else {
307​ drawMidHelpText(painter);
114 } 308​ }
115 } 309​}
116 310​
117 if (config->useLightRegionMaskColour()) { 311​inline void QuickEditor::layoutBottomHelpText()
118 rootItem->setProperty("maskColour", QColor(255, 255, 255, 100)); 312​{
broulikUnsubmitted
Done

Use braces even for single-line statements

if (...) {
    return;
}
broulik: Use braces even for single-line statements ``` if (...) { return; } ```
119 rootItem->setProperty("strokeColour", QColor(96, 96, 96, 255)); 313​ const QRect& fullRect = geometry();
314​ int mMaxRightWidth = 0;
315​ int width = 0;
316​ int height = 0;
317​ mBottomHelpGridLeftWidth = 0;
318​ for (auto& item : mBottomHelpText) {
319​ auto& left = item.first;
320​ auto& right = item.second;
321​ const auto leftSize = left.size().toSize();
322​ const auto rightSize = right.size().toSize();
323​ mBottomHelpGridLeftWidth = qMax(mBottomHelpGridLeftWidth, leftSize.width());
324​ mMaxRightWidth = qMax(mMaxRightWidth, rightSize.width());
325​ width = qMax(width, mBottomHelpGridLeftWidth + mMaxRightWidth + bottomHelpBoxPairSpacing);
326​ height += bottomHelpBoxLineHeight;
broulikUnsubmitted
Done

const auto &

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