Add Shortcut to Cancel current selection

README.md

@@ -213,6 +213,7 @@ These shortcuts are available in GUI mode:
 | <kbd>Ctrl</kbd> + <kbd>Q</kbd>                                            | Leave the capture screen                                         |
 | <kbd>Ctrl</kbd> + <kbd>O</kbd>                                            | Choose an app to open the capture                                |
 | <kbd>Ctrl</kbd> + <kbd>Return</kbd>                                            | Commit text in text area|
+| <kbd>Ctrl</kbd> + <kbd>Backspace</kbd>                                    | Cancel current selection                                       | 
 | <kbd>Return</kbd>                                             | Upload the selection to Imgur                                      |
 | <kbd>Spacebar</kbd>                                                       | Toggle visibility of sidebar with options of the selected tool, color picker for the drawing color and history menu |
 | Right Click                                                               | Show the color wheel                                              |

flameshot.example.ini

@@ -96,6 +96,7 @@
 ;; Shortcut Settings for all tools
 ;[Shortcuts]
 ;TYPE_ARROW=A
+;TYPE_CANCEL=Ctrl+Backspace
 ;TYPE_CIRCLE=C
 ;TYPE_CIRCLECOUNT=
 ;TYPE_COMMIT_CURRENT_TOOL=Ctrl+Return

src/config/shortcutswidget.cpp

@@ -191,6 +191,7 @@ void ShortcutsWidget::loadShortcuts()
     appendShortcut("TYPE_MOVE_DOWN", tr("Move selection down 1px"));
     appendShortcut("TYPE_COMMIT_CURRENT_TOOL", tr("Commit text in text area"));
     appendShortcut("TYPE_DELETE_CURRENT_TOOL", tr("Delete current tool"));
+	appendShortcut("TYPE_CANCLE", tr("Cancel current selection"));
 
     // non-editable shortcuts have an empty shortcut name
 

src/tools/capturetool.h

@@ -48,6 +48,7 @@ class CaptureTool : public QObject
         TYPE_SIZEDECREASE = 21,
         TYPE_INVERT = 22,
         TYPE_ACCEPT = 23,
+		TYPE_CANCEL = 24,
     };
     Q_ENUM(Type);
 

src/utils/confighandler.cpp

@@ -144,6 +144,7 @@ static QMap<QString, QSharedPointer<KeySequence>> recognizedShortcuts = {
     SHORTCUT("TYPE_SAVE"                ,   "Ctrl+S"                ),
     SHORTCUT("TYPE_ACCEPT"              ,   "Return"                ),
     SHORTCUT("TYPE_EXIT"                ,   "Ctrl+Q"                ),
+	SHORTCUT("TYPE_CANCEL" 				,	"Ctrl+Backspace"		),
     SHORTCUT("TYPE_IMAGEUPLOADER"       ,                           ),
 #if !defined(Q_OS_MACOS)
     SHORTCUT("TYPE_OPEN_APP"            ,   "Ctrl+O"                ),

src/widgets/capture/capturewidget.cpp

@@ -753,7 +753,6 @@ void CaptureWidget::mousePressEvent(QMouseEvent* e)
     if (m_selection->getMouseSide(e->pos()) != SelectionWidget::CENTER) {
         m_panel->setActiveLayer(-1);
     }
-
     if (e->button() == Qt::RightButton) {
         if (m_activeTool && m_activeTool->editMode()) {
             return;
@@ -1560,6 +1559,10 @@ void CaptureWidget::initShortcuts()
                 m_selection,
                 SLOT(moveDown()));
 
+	newShortcut(QKeySequence(ConfigHandler().shortcut("TYPE_CANCEL")),
+				this,
+				SLOT(cancel()));
+
     newShortcut(
       QKeySequence(ConfigHandler().shortcut("TYPE_DELETE_CURRENT_TOOL")),
       this,
@@ -1871,6 +1874,23 @@ void CaptureWidget::redo()
     restoreCircleCountState();
 }
 
+void CaptureWidget::cancel()
+{
+    if (m_activeButton != nullptr) {
+        uncheckActiveTool();
+    }
+    if (m_panel) {
+        m_panel->setActiveLayer(-1);
+    }
+    if (m_toolWidget) {
+        m_toolWidget->hide();
+        delete m_toolWidget;
+        m_toolWidget = nullptr;
+    }
+    m_selection->hide();
+    emit m_selection->geometrySettled();
+}
+
 QRect CaptureWidget::extendedSelection() const
 {
     if (m_selection == nullptr) {

src/widgets/capture/capturewidget.h

@@ -69,6 +69,7 @@ public slots:
 private slots:
     void undo();
     void redo();
+	void cancel();
     void togglePanel();
     void childEnter();
     void childLeave();