resize cropped image added and some improvements

Author: sulincix

src/DrawingWidget.cpp

@@ -283,16 +283,15 @@ DrawingWidget::DrawingWidget(QWidget *parent): QWidget(parent) {
     penMode = DRAW;
     reset = true;
     setMouseTracking(true);
-    crop = new QLabel("");
     cropWidget = new MovableWidget(mainWindow);
     cropWidget->stackUnder(this);
     QBoxLayout* cropLayout = new QVBoxLayout(cropWidget);
-    cropLayout->addWidget(crop);
+    cropLayout->addWidget(cropWidget->crop);
     cropLayout->setContentsMargins(0,0,0,0);
     cropLayout->setSpacing(0);
     cropWidget->setStyleSheet("border: 2px solid "+penColor.name()+";");
     cropWidget->hide();
-    
+
     //QScreen *screen = QGuiApplication::primaryScreen();
     fpressure = get_int((char*)"pressure") / 100.0;
 }

src/DrawingWidget.h

@@ -81,7 +81,6 @@ class DrawingWidget : public QWidget {
     void drawLineToFunc(const QPointF startPoint, const QPointF endPoint, qreal pressure);
     void selectionDraw(QPointF startPoint, QPointF endPoint);
     bool event(QEvent * ev);
-    QLabel* crop;
     QPainter painter;
 };
 

src/Selection.cpp

@@ -1,22 +1,43 @@
 #include "DrawingWidget.h"
 #include "Selection.h"
 
-MovableWidget::MovableWidget(QWidget *parent) : QWidget(parent) {}
+MovableWidget::MovableWidget(QWidget *parent) : QWidget(parent) {
+    crop = new QLabel("");
+}
+
+extern float scale;
+#define nearEdge 10*scale
 
 void MovableWidget::mousePressEvent(QMouseEvent *event) {
-     (void)event;
-     lastMousePosition = event->pos();
-     dragging = true;
+    lastMousePosition = event->pos();
+    int xx = width() - event->pos().x();
+    int yy = height() - event->pos().y();
+    if(width() - xx < 50 || xx < 50 || height() - yy < 50 || yy < 50) {
+        mode = RESIZE;
+    } else{
+        mode = DRAG;
+    }
 }
 
 void MovableWidget::mouseMoveEvent(QMouseEvent *event) {
-    QPoint newPos = mapToParent(event->pos() - lastMousePosition);
-    move(newPos); // Move the widget to the new position
+    QPoint newPos;
+    if(mode == RESIZE) {
+        QPoint center = QPoint(pos().x() + (width()/2), pos().y() + (height()/2));
+        setFixedSize(
+            abs((mapToParent(event->pos()).x() - center.x())*2),
+            abs((mapToParent(event->pos()).y() - center.y())*2)
+        );
+        QPixmap pixmap = QPixmap::fromImage(image.scaled(width(), height()));
+        crop->setPixmap(pixmap);
+        newPos = QPoint(center.x() - (width()/2), center.y() - (height()/2));
+    } else if (mode == DRAG) {
+        newPos = mapToParent(event->pos() - lastMousePosition);
+    }
+    move(newPos);
 }
 
 void MovableWidget::mouseReleaseEvent(QMouseEvent *event) {
     (void)event;
-    dragging = false;
 }
 
 static bool hasSelection = false;
@@ -40,7 +61,7 @@ void DrawingWidget::createSelection() {
     printf("%d %d\n", cropRect.width(), cropRect.height());
     cropWidget->setFixedSize(cropRect.width(), cropRect.height());
     QPixmap pixmap = QPixmap::fromImage(cropWidget->image);
-    crop->setPixmap(pixmap);
+    cropWidget->crop->setPixmap(pixmap);
     cropWidget->move(topLeft);
     cropWidget->raise();
     cropWidget->show();
@@ -54,7 +75,7 @@ void DrawingWidget::mergeSelection() {
     hasSelection = false;
     painter.begin(&image);
     painter.setPen(Qt::NoPen);
-    painter.drawImage(QPoint(cropWidget->x(), cropWidget->y()), cropWidget->image);
+    painter.drawImage(QPoint(cropWidget->x(), cropWidget->y()), cropWidget->image.scaled(cropWidget->width(), cropWidget->height()));
     cropWidget->setFixedSize(0,0);
     cropWidget->move(QPoint(-1,-1));
     update();

src/Selection.h

@@ -4,10 +4,14 @@
 #include <QWidget>
 #include <QMouseEvent>
 
+#define DRAG 0
+#define RESIZE 1
+
 class MovableWidget : public QWidget {
 
 public:
     QImage image;
+    QLabel* crop;
     explicit MovableWidget(QWidget *parent = nullptr);
 
 protected:
@@ -17,7 +21,7 @@ class MovableWidget : public QWidget {
 
 private:
     QPoint lastMousePosition;
-    bool dragging = false;
+    int mode = 0;
 };
 
 #endif