benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt5 deprications (#2076)

Browse Source 
* working on removing deprecated warnings for Qt6 migration

* tewsting 18.04 fix
This commit is contained in:
borgmanJeremy
2021-11-21 14:40:56 -06:00
committed by GitHub
parent 8ab1ac0eaa
commit b8c0b74ea2
4 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/utils/screengrabber.cpp
View File

@@ -144,12 +144,11 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool& ok)
#endif
}
QRect ScreenGrabber::screenGeometry(int screenNumber)
QRect ScreenGrabber::screenGeometry(QScreen* screen)
{
QPixmap p;
QRect geometry;
bool isVirtual = QApplication::desktop()->isVirtualDesktop();
if (isVirtual || m_info.waylandDetected()) {
if (m_info.waylandDetected()) {
QPoint topLeft(0, 0);
#ifdef Q_OS_WIN
for (QScreen* const screen : QGuiApplication::screens()) {
@@ -160,7 +159,7 @@ QRect ScreenGrabber::screenGeometry(int screenNumber)
}
}
#endif
geometry = QApplication::desktop()->screenGeometry(screenNumber);
geometry = screen->geometry();
geometry.moveTo(geometry.topLeft() - topLeft);
} else {
QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen();
@@ -169,12 +168,11 @@ QRect ScreenGrabber::screenGeometry(int screenNumber)
return geometry;
}
QPixmap ScreenGrabber::grabScreen(int screenNumber, bool& ok)
QPixmap ScreenGrabber::grabScreen(QScreen* screen, bool& ok)
{
QPixmap p;
bool isVirtual = QApplication::desktop()->isVirtualDesktop();
QRect geometry = screenGeometry(screenNumber);
if (isVirtual || m_info.waylandDetected()) {
QRect geometry = screenGeometry(screen);
if (m_info.waylandDetected()) {
p = grabEntireDesktop(ok);
if (ok) {
return p.copy(geometry);
@@ -182,11 +180,8 @@ QPixmap ScreenGrabber::grabScreen(int screenNumber, bool& ok)
} else {
ok = true;
QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen();
return currentScreen->grabWindow(screenNumber,
geometry.x(),
geometry.y(),
geometry.width(),
geometry.height());
return currentScreen->grabWindow(
geometry.x(), geometry.y(), geometry.width(), geometry.height());
}
return p;
}