Start adding coordinate conversion between view and capture.

src/core/controller.cpp

@@ -295,7 +295,8 @@ void Controller::startVisualCapture(const uint id,
             return;
         }
 
-        m_captureWindow = new CaptureWidget(id, forcedSavePath);
+        //m_captureWindow = new CaptureWidget(id, forcedSavePath, ConfigHandler().windowMode());
+        m_captureWindow = new CaptureWidget(id, forcedSavePath, CaptureConfig::MaximizeWindow);
         // m_captureWindow = new CaptureWidget(id, forcedSavePath, false); //
         // debug
         connect(m_captureWindow,
@@ -307,18 +308,8 @@ void Controller::startVisualCapture(const uint id,
                 this,
                 &Controller::captureTaken);
 
-#ifdef Q_OS_WIN
-        m_captureWindow->show();
-#elif defined(Q_OS_MACOS)
-        // In "Emulate fullscreen mode"
-        m_captureWindow->showFullScreen();
-        m_captureWindow->activateWindow();
-        m_captureWindow->raise();
-#else
-        //m_captureWindow->showFullScreen();
-        m_captureWindow->showMaximized();
-//        m_captureWindow->show(); // For CaptureWidget Debugging under Linux
-#endif
+        m_captureWindow->OpenAndShow();
+
         if (!m_appLatestUrl.isEmpty() &&
             ConfigHandler().ignoreUpdateToVersion().compare(
               m_appLatestVersion) < 0) {

src/utils/confighandler.cpp

@@ -10,6 +10,7 @@
 #include <QFile>
 #include <QKeySequence>
 #include <QStandardPaths>
+#include <QMetaEnum>
 #include <algorithm>
 #if defined(Q_OS_MACOS)
 #include <QProcess>
@@ -75,6 +76,27 @@ void ConfigHandler::setButtons(
                         QVariant::fromValue(l.toList()));
 }
 
+CaptureConfig::CaptureWindowMode ConfigHandler::windowMode()
+{
+    auto modeEnum = QMetaEnum::fromType<CaptureConfig::CaptureWindowMode>();
+    auto modeString = m_settings.value("windowMode", "").toString().toUtf8();
+    bool ok = false;
+    CaptureConfig::CaptureWindowMode result = static_cast<CaptureConfig::CaptureWindowMode>(modeEnum.keyToValue(modeString.constData(), &ok));
+    if (ok) {
+        return result;
+    }
+#if defined(Q_OS_MACOS)
+    return CaptureConfig::CaptureWindowMode::FullScreenCurrent;
+#endif
+    return CaptureConfig::CaptureWindowMode::FullScreenAll;
+}
+
+void ConfigHandler::setWindowMode(CaptureConfig::CaptureWindowMode mode)
+{
+    auto modeEnum = QMetaEnum::fromType<CaptureConfig::CaptureWindowMode>();
+    m_settings.setValue("windowMode", modeEnum.valueToKey(static_cast<int>(mode)));
+}
+
 QVector<QColor> ConfigHandler::getUserColors()
 {
     QVector<QColor> colors;

src/utils/confighandler.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "src/widgets/capture/capturetoolbutton.h"
+#include "src/widgets/capture/captureconfig.h"
 #include <QSettings>
 #include <QStringList>
 #include <QVariant>
@@ -17,6 +18,9 @@ class ConfigHandler
     QVector<CaptureToolButton::ButtonType> getButtons();
     void setButtons(const QVector<CaptureToolButton::ButtonType>&);
 
+    CaptureConfig::CaptureWindowMode windowMode();
+    void setWindowMode(CaptureConfig::CaptureWindowMode);
+
     QVector<QColor> getUserColors();
 
     QString savePath();

src/widgets/capture/CMakeLists.txt

@@ -4,6 +4,7 @@ target_sources(
         PRIVATE buttonhandler.h
         capturebutton.h
         capturetoolbutton.h
+        captureconfig.h
         capturewidget.h
         colorpicker.h
         hovereventfilter.h

src/widgets/capture/captureconfig.h

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+
+#pragma once
+
+#include <QObject>
+
+namespace CaptureConfig {
+    Q_NAMESPACE
+
+    enum CaptureWindowMode {
+        FullScreenAll,
+        FullScreenCurrent,
+        MaximizeWindow,
+        DebugNonFullScreen
+    };
+    Q_ENUM_NS(CaptureWindowMode)
+}