selection clear added

Author: sulincix

src/DrawingWidget.h

@@ -130,6 +130,7 @@ class DrawingWidget : public QWidget {
     bool isNextAvailable();
     void loadImage(int num);
     void mergeSelection();
+    void clearSelection();
     void addImage(QImage img);
 
 protected:

src/Selection.cpp

@@ -45,6 +45,10 @@ void MovableWidget::mouseReleaseEvent(QMouseEvent *event) {
 
 static bool hasSelection = false;
 
+static QPointF last_end = QPointF(0,0);
+static QPointF last_begin = QPointF(0,0);
+static int rad = 0;
+
 void DrawingWidget::createSelection() {
     hasSelection = true;
     //printf("%f %f %f %f\n", startPoint.x(), endPoint.x(), startPoint.y(), endPoint.y());
@@ -69,7 +73,29 @@ void DrawingWidget::createSelection() {
     cropWidget->move(topLeft);
     cropWidget->raise();
     cropWidget->show();
-    update();
+
+    rad = penSize[penType];
+    update(QRectF(
+        last_begin, last_end
+    ).toRect().normalized().adjusted(-rad, -rad, +rad, +rad));
+    update(QRectF(
+        startPoint, endPoint
+    ).toRect().normalized().adjusted(-rad, -rad, +rad, +rad));
+    last_begin = startPoint;
+    last_end = endPoint;
+}
+
+void DrawingWidget::clearSelection() {
+    if(!hasSelection){
+        return;
+    }
+    hasSelection = false;
+    cropWidget->setFixedSize(0,0);
+    cropWidget->move(QPoint(-1,-1));
+    cropWidget->image = QImage(QSize(0,0), QImage::Format_ARGB32);
+    cropWidget->image.fill(QColor("transparent"));
+    addImage(image);
+
 }
 
 void DrawingWidget::mergeSelection() {
@@ -80,9 +106,7 @@ void DrawingWidget::mergeSelection() {
     painter.begin(&image);
     painter.setPen(Qt::NoPen);
     painter.drawImage(QPoint(cropWidget->x(), cropWidget->y()), cropWidget->image.scaled(cropWidget->width(), cropWidget->height()));
-    cropWidget->setFixedSize(0,0);
-    cropWidget->move(QPoint(-1,-1));
     update();
     painter.end();
-    addImage(image);
+    clearSelection();
 }

src/SetupWidgets.cpp

@@ -967,6 +967,10 @@ static void setupClear(){
     clearButtonLayout->addWidget(yesButton);
 
     QPushButton *clear = create_button(":images/clear.svg", [=](){
+        if(drawing->penMode == SELECTION) {
+            drawing->clearSelection();
+            return;
+        }
         floatingSettings->setPage(3);
         floatingWidget->setFloatingOffset(7);
     });