[pull] master from flameshot-org:master

src/config/generalconf.cpp

@@ -56,6 +56,9 @@ GeneralConf::GeneralConf(QWidget* parent)
     initAntialiasingPinZoom();
     initUndoLimit();
     initInsecurePixelate();
+#if !defined(Q_OS_MACOS)
+    initCaptureActiveMonitor();
+#endif
 #if defined(Q_OS_LINUX)
     initUseX11LegacyScreenshot();
 #endif
@@ -127,6 +130,9 @@ void GeneralConf::_updateComponents(bool allowEmptySavePath)
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
     m_showTray->setChecked(!config.disabledTrayIcon());
 #endif
+#if !defined(Q_OS_MACOS)
+    m_captureActiveMonitor->setChecked(config.captureActiveMonitor());
+#endif
 #if defined(Q_OS_LINUX)
     m_useX11LegacyScreenshot->setChecked(config.useX11LegacyScreenshot());
 #endif
@@ -916,6 +922,29 @@ void GeneralConf::setInsecurePixelate(bool checked)
     ConfigHandler().setInsecurePixelate(checked);
 }
 
+#if !defined(Q_OS_MACOS)
+void GeneralConf::initCaptureActiveMonitor()
+{
+    m_captureActiveMonitor = new QCheckBox(
+      tr("Capture active monitor (skip monitor selection)"), this);
+    m_captureActiveMonitor->setToolTip(
+      tr("Automatically capture the monitor where the cursor is located "
+         "instead of showing the monitor selection dialog. "
+         "This feature is not supported on Wayland."));
+    m_scrollAreaLayout->addWidget(m_captureActiveMonitor);
+
+    connect(m_captureActiveMonitor,
+            &QCheckBox::clicked,
+            this,
+            &GeneralConf::captureActiveMonitorChanged);
+}
+
+void GeneralConf::captureActiveMonitorChanged(bool checked)
+{
+    ConfigHandler().setCaptureActiveMonitor(checked);
+}
+#endif
+
 #if defined(Q_OS_LINUX)
 void GeneralConf::initUseX11LegacyScreenshot()
 {

src/config/generalconf.h

@@ -61,6 +61,9 @@ private slots:
     void setJpegQuality(int v);
     void setReverseArrow(bool checked);
     void setInsecurePixelate(bool checked);
+#if !defined(Q_OS_MACOS)
+    void captureActiveMonitorChanged(bool checked);
+#endif
 #if defined(Q_OS_LINUX)
     void useX11LegacyScreenshotChanged(bool checked);
 #endif
@@ -102,6 +105,9 @@ private slots:
     void initJpegQuality();
     void initReverseArrow();
     void initInsecurePixelate();
+#if !defined(Q_OS_MACOS)
+    void initCaptureActiveMonitor();
+#endif
 #if defined(Q_OS_LINUX)
     void initUseX11LegacyScreenshot();
 #endif
@@ -153,6 +159,9 @@ private slots:
     QSpinBox* m_jpegQuality;
     QCheckBox* m_reverseArrow;
     QCheckBox* m_insecurePixelate;
+#if !defined(Q_OS_MACOS)
+    QCheckBox* m_captureActiveMonitor;
+#endif
 #if defined(Q_OS_LINUX)
     QCheckBox* m_useX11LegacyScreenshot;
 #endif

src/utils/confighandler.cpp

@@ -140,6 +140,11 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
     // Not visible on settings dialog
     OPTION("ignorePrntScrForcesSnipping" ,Bool               ( false         )),
 #endif
+#if !defined(Q_OS_MACOS)
+    // Auto-select the monitor under the cursor instead of showing
+    // the monitor selection UI. Not supported on Wayland.
+    OPTION("captureActiveMonitor"         ,Bool               ( false         )),
+#endif
 #if defined(Q_OS_LINUX)
     // Bypass freedesktop portal and use Qt's native X11
     // screenshot method. Intended for WMs without xdg-desktop-portal.

src/utils/confighandler.h

@@ -145,6 +145,9 @@ class ConfigHandler : public QObject
                          setIgnorePrntScrForcesSnipping,
                          bool)
 #endif
+#if !defined(Q_OS_MACOS)
+    CONFIG_GETTER_SETTER(captureActiveMonitor, setCaptureActiveMonitor, bool)
+#endif
 #if defined(Q_OS_LINUX)
     CONFIG_GETTER_SETTER(useX11LegacyScreenshot,
                          setUseX11LegacyScreenshot,

src/utils/screengrabber.cpp

@@ -152,6 +152,26 @@ QPixmap ScreenGrabber::selectMonitorAndCrop(const QPixmap& fullScreenshot,
         return cropToMonitor(fullScreenshot, 0);
     }
 
+    // Capture Active Monitor: auto-select monitor under cursor
+    if (ConfigHandler().captureActiveMonitor()) {
+        if (m_info.waylandDetected()) {
+            AbstractLogger::error()
+              << tr("Capture Active Monitor is not supported on Wayland due to "
+                    "Wayland security model.");
+            ok = false;
+            return QPixmap();
+        }
+
+        QGuiAppCurrentScreen screenFinder;
+        QScreen* cursorScreen = screenFinder.currentScreen();
+        int monitorIndex = screens.indexOf(cursorScreen);
+        if (monitorIndex >= 0) {
+            m_selectedMonitor = monitorIndex;
+            return cropToMonitor(fullScreenshot, monitorIndex);
+        }
+        // Fall through to manual selection if screen lookup fails
+    }
+
     if (m_monitorSelectionActive) {
         AbstractLogger::error()
           << tr("Screenshot already in progress, please wait for the current "