From d0f0aed29d458dbb8cad7d2054ac2b8f308e476d Mon Sep 17 00:00:00 2001
From: Norman Heino <norman.heino@gmail.com>
Date: Sun, 5 May 2019 13:40:15 +0200
Subject: [PATCH] Improve screenshot feature

Limit screenshots to OSCAR's application window under macOS.
Use main window geometry as basis for screen capture rectangle, removing
the need for resizeing hacks.

Tested on:
* macOS 10.14
* Ubuntu 18.04
* Windows 10
---
 oscar/mainwindow.cpp | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index a95eb658..5171873f 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -1351,32 +1351,19 @@ void MainWindow::on_action_Screenshot_triggered()
     ui->toolBox->hide();
     QTimer::singleShot(250, this, SLOT(DelayedScreenshot()));
 }
+
 void MainWindow::DelayedScreenshot()
 {
     // Make sure to scale for high resolution displays (like Retina)
    // qreal pr = devicePixelRatio();
 
-
-    QScreen * screen = QApplication::primaryScreen();
-
-
-    int titleBarHeight = -QApplication::style()->pixelMetric(QStyle::PM_TitleBarHeight);
-#ifdef Q_OS_WIN
-    titleBarHeight += 6;
-#endif
-
-    QPixmap pixmap = screen->grabWindow(winId(),0,titleBarHeight);
-
-/*#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_HAIKU)
-     // grab the whole screen
-    grab()
-     QPixmap desktop = QPixmap::grabWindow(QApplication::desktop()->winId());
-
-     QPixmap pixmap = desktop.copy(x() * pr, y() * pr, (width()+6) * pr, (height()+22) * pr);
-
-#elif defined(Q_OS_MAC)
-    QPixmap pixmap = QPixmap::grabWindow(this->winId(), x(), y(), width() / pr, (height() / pr) + 10);
-#endif */
+    auto screenshotRect = geometry();
+    auto titleBarHeight = QApplication::style()->pixelMetric(QStyle::PM_TitleBarHeight);
+    auto pixmap = QApplication::primaryScreen()->grabWindow(QDesktopWidget().winId(),
+                                                            screenshotRect.left(),
+                                                            screenshotRect.top() - titleBarHeight,
+                                                            screenshotRect.width(),
+                                                            screenshotRect.height() + titleBarHeight);
 
     QString a = p_pref->Get("{home}/Screenshots");
     QDir dir(a);