marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 17:54:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quicksettings: convert screenshot interface to class member

Browse source
This commit is contained in:
Luca Weiss 2020-04-29 18:17:43 +02:00
parent 782d583175
commit 6db9537dd3
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
containments/panel/phonepanel.cpp
View file

@ -29,14 +29,13 @@
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
#include <QScreen> #include <QScreen>
#include "screenshotinterface.h"
constexpr int SCREENSHOT_DELAY = 200; constexpr int SCREENSHOT_DELAY = 200;
PhonePanel::PhonePanel(QObject *parent, const QVariantList &args) PhonePanel::PhonePanel(QObject *parent, const QVariantList &args)
: Plasma::Containment(parent, args) : Plasma::Containment(parent, args)
{ {
//setHasConfigurationInterface(true); //setHasConfigurationInterface(true);
m_screenshotInterface = new org::kde::kwin::Screenshot(QStringLiteral("org.kde.KWin"), QStringLiteral("/Screenshot"), QDBusConnection::sessionBus(), this);
} }
PhonePanel::~PhonePanel() = default; PhonePanel::~PhonePanel() = default;
@ -84,12 +83,10 @@ void PhonePanel::takeScreenshot()
{ {
// wait ~200 ms to wait for rest of animations // wait ~200 ms to wait for rest of animations
QTimer::singleShot(SCREENSHOT_DELAY, [=]() { QTimer::singleShot(SCREENSHOT_DELAY, [=]() {
auto *interface = new org::kde::kwin::Screenshot(QStringLiteral("org.kde.KWin"), QStringLiteral("/Screenshot"), QDBusConnection::sessionBus(), this);
// screenshot fullscreen currently doesn't work on all devices -> we need to use screenshot area // screenshot fullscreen currently doesn't work on all devices -> we need to use screenshot area
// this won't work with multiple screens // this won't work with multiple screens
QSize screenSize = QGuiApplication::primaryScreen()->size(); QSize screenSize = QGuiApplication::primaryScreen()->size();
QDBusPendingReply<QString> reply = interface->screenshotArea(0, 0, screenSize.width(), screenSize.height()); QDBusPendingReply<QString> reply = m_screenshotInterface->screenshotArea(0, 0, screenSize.width(), screenSize.height());
auto *watcher = new QDBusPendingCallWatcher(reply, this); auto *watcher = new QDBusPendingCallWatcher(reply, this);
connect(watcher, &QDBusPendingCallWatcher::finished, this, [=](QDBusPendingCallWatcher *watcher) { connect(watcher, &QDBusPendingCallWatcher::finished, this, [=](QDBusPendingCallWatcher *watcher) {
@ -128,7 +125,6 @@ void PhonePanel::takeScreenshot()
} }
watcher->deleteLater(); watcher->deleteLater();
interface->deleteLater();
}); });
}); });
} }

3
containments/panel/phonepanel.h
View file

@ -26,6 +26,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "screenshotinterface.h"
class PhonePanel : public Plasma::Containment class PhonePanel : public Plasma::Containment
{ {
@ -45,6 +46,8 @@ private:
GstElement* m_sink; GstElement* m_sink;
GstElement* m_source; GstElement* m_source;
bool m_running = false; bool m_running = false;
org::kde::kwin::Screenshot *m_screenshotInterface;
}; };
#endif #endif