fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-03 17:17:25 +00:00
Code Issues 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

19
src/core/controller.cpp
View File

@@ -226,8 +226,6 @@ void Controller::requestCapture(const CaptureRequest& request)
this->startFullscreenCapture(id);
});
break;
// TODO: Figure out the code path that gets here so the deprated
// warning can be fixed
case CaptureRequest::SCREEN_MODE: {
int&& number = request.data().toInt();
doLater(request.delay(), this, [this, id, number]() {
@@ -320,20 +318,25 @@ void Controller::startVisualCapture(const uint id,
void Controller::startScreenGrab(const uint id, const int screenNumber)
{
bool ok = true;
int n = screenNumber;
auto screen = qApp->screens()[screenNumber];
if (n < 0) {
if (screenNumber < 0) {
QPoint globalCursorPos = QCursor::pos();
n = qApp->desktop()->screenNumber(globalCursorPos);
#if QT_VERSION > QT_VERSION_CHECK(5, 10, 0)
screen = qApp->screenAt(globalCursorPos);
#else
screen =
qApp->screens()[qApp->desktop()->screenNumber(globalCursorPos)];
#endif
}
QPixmap p(ScreenGrabber().grabScreen(n, ok));
QPixmap p(ScreenGrabber().grabScreen(screen, ok));
if (ok) {
CaptureRequest& req = *requests().find(id);
QRect region = req.initialSelection();
if (region.isNull()) {
region = ScreenGrabber().screenGeometry(n);
region = ScreenGrabber().screenGeometry(screen);
} else {
QRect screenGeom = ScreenGrabber().screenGeometry(n);
QRect screenGeom = ScreenGrabber().screenGeometry(screen);
screenGeom.moveTopLeft({ 0, 0 });
region = region.intersected(screenGeom);
p = p.copy(region);