chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve screenshot feature

Browse Source 
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
This commit is contained in:
Norman Heino 2019-05-05 13:40:15 +02:00
parent c6c11fd4f9
commit d0f0aed29d
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
oscar/mainwindow.cpp
View File

@ -1351,32 +1351,19 @@ void MainWindow::on_action_Screenshot_triggered()
ui->toolBox->hide(); ui->toolBox->hide();
QTimer::singleShot(250, this, SLOT(DelayedScreenshot())); QTimer::singleShot(250, this, SLOT(DelayedScreenshot()));
} }
void MainWindow::DelayedScreenshot() void MainWindow::DelayedScreenshot()
{ {
// Make sure to scale for high resolution displays (like Retina) // Make sure to scale for high resolution displays (like Retina)
// qreal pr = devicePixelRatio(); // qreal pr = devicePixelRatio();
auto screenshotRect = geometry();
QScreen * screen = QApplication::primaryScreen(); auto titleBarHeight = QApplication::style()->pixelMetric(QStyle::PM_TitleBarHeight);
auto pixmap = QApplication::primaryScreen()->grabWindow(QDesktopWidget().winId(),
screenshotRect.left(),
int titleBarHeight = -QApplication::style()->pixelMetric(QStyle::PM_TitleBarHeight); screenshotRect.top() - titleBarHeight,
#ifdef Q_OS_WIN screenshotRect.width(),
titleBarHeight += 6; screenshotRect.height() + titleBarHeight);
#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 */
QString a = p_pref->Get("{home}/Screenshots"); QString a = p_pref->Get("{home}/Screenshots");
QDir dir(a); QDir dir(a);