Revert "Workaround KWin screenshot bug by using screenArea manually"

This reverts commit a0b8a970ef.

The workaround didn't work anyway. - The bug also affects Qt/QScreen
...
This commit is contained in:
Linus Jahn 2020-02-08 17:37:01 +01:00
parent a0b8a970ef
commit a3d8270e90
No known key found for this signature in database
GPG key ID: 4663231A91A1E27B

View file

@ -22,10 +22,8 @@
#include <QDateTime> #include <QDateTime>
#include <QDBusPendingReply> #include <QDBusPendingReply>
#include <QDebug>
#include <QFile> #include <QFile>
#include <QGuiApplication> #include <QDebug>
#include <QScreen>
#include <QStandardPaths> #include <QStandardPaths>
#include <QProcess> #include <QProcess>
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
@ -83,11 +81,7 @@ void PhonePanel::toggleTorch()
void PhonePanel::takeScreenshot() void PhonePanel::takeScreenshot()
{ {
auto *interface = new org::kde::kwin::Screenshot(QStringLiteral("org.kde.KWin"), QStringLiteral("/Screenshot"), QDBusConnection::sessionBus(), this); auto *interface = new org::kde::kwin::Screenshot(QStringLiteral("org.kde.KWin"), QStringLiteral("/Screenshot"), QDBusConnection::sessionBus(), this);
QDBusPendingReply<QString> reply = interface->screenshotFullscreen();
// screenshot fullscreen currently doesn't work on all devices -> we need to use screenshot area
// this won't work with multiple screens
QSize screenSize = QGuiApplication::primaryScreen()->size();
QDBusPendingReply<QString> reply = interface->screenshotArea(0, 0, screenSize.width(), screenSize.height());
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this); QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
connect(watcher, &QDBusPendingCallWatcher::finished, this, [=](QDBusPendingCallWatcher *watcher) { connect(watcher, &QDBusPendingCallWatcher::finished, this, [=](QDBusPendingCallWatcher *watcher) {