Fix screen capture ignoring GUI last-region setting (#4789)

* Fix screen capture ignoring GUI last-region setting

* Fix clang-format for empty constructor

* Restore saved region for GUI captures

---------

Co-authored-by: serebryakov02 <nik04ta01@gmail.com>

Author: serebryakov02

src/core/capturerequest.cpp

@@ -2,12 +2,7 @@
 // SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
 
 #include "capturerequest.h"
-#include "config/cacheutils.h"
-#include "utils/confighandler.h"
 
-#include <QApplication>
-#include <QClipboard>
-#include <QDateTime>
 #include <stdexcept>
 #include <utility>
 
@@ -21,14 +16,7 @@ CaptureRequest::CaptureRequest(CaptureRequest::CaptureMode mode,
   , m_data(std::move(data))
   , m_selectedMonitor(-1)
   , m_hasSelectedMonitor(false)
-{
-
-    ConfigHandler config;
-    if (m_mode == CaptureRequest::CaptureMode::GRAPHICAL_MODE &&
-        config.saveLastRegion()) {
-        setInitialSelection(getLastRegion());
-    }
-}
+{}
 
 CaptureRequest::CaptureMode CaptureRequest::captureMode() const
 {

src/core/flameshot.cpp

@@ -42,6 +42,7 @@ constexpr const char* visibleInDockProperty = "_visibleInDock";
 #include <CoreGraphics/CoreGraphics.h>
 #endif
 
+#include "config/cacheutils.h"
 #include "config/configresolver.h"
 #include "config/configwindow.h"
 #include "core/qguiappcurrentscreen.h"
@@ -125,6 +126,13 @@ CaptureWidget* Flameshot::gui(const CaptureRequest& req)
         return nullptr;
     }
 
+    CaptureRequest request = req;
+    if (request.captureMode() == CaptureRequest::GRAPHICAL_MODE &&
+        request.initialSelection().isNull() &&
+        ConfigHandler().saveLastRegion()) {
+        request.setInitialSelection(getLastRegion());
+    }
+
 #if defined(Q_OS_MACOS)
     // This is required on MacOS because of Mission Control. If you'll switch to
     // another Desktop you cannot take a new screenshot from the tray, you have
@@ -157,7 +165,7 @@ CaptureWidget* Flameshot::gui(const CaptureRequest& req)
             return nullptr;
         }
 
-        m_captureWindow = new CaptureWidget(req);
+        m_captureWindow = new CaptureWidget(request);
 
 #ifdef Q_OS_WIN
         m_captureWindow->show();

src/utils/screengrabber.cpp

@@ -255,6 +255,12 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool& ok, int preSelectedMonitor)
         ok = false;
         return QPixmap();
     }
+    m_selectedMonitor = QGuiApplication::screens().indexOf(currentScreen);
+    if (m_selectedMonitor < 0) {
+        AbstractLogger::error() << tr("Unable to get current screen");
+        ok = false;
+        return QPixmap();
+    }
     const QRect geom = currentScreen->geometry();
     screenshot = currentScreen->grabWindow(
       wid, geom.x(), geom.y(), geom.width(), geom.height());