dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining X11Extras stuff

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-13 00:30:37 +02:00
parent 877c9ca41a
commit 23fb4651be
6 changed files with 13 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osd/osdpretty.cpp
View File

@@ -51,14 +51,12 @@
#include <QFlags>
#include <QtEvents>
#include "core/settings.h"
#ifdef HAVE_X11EXTRAS
# include <QX11Info>
#elif defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
#ifdef HAVE_QPA_QPLATFORMNATIVEINTERFACE_H
# include <qpa/qplatformnativeinterface.h>
#endif
#include "core/settings.h"
#include "osdpretty.h"
#include "ui_osdpretty.h"
@@ -85,7 +83,6 @@ const int OSDPretty::kSnapProximity = 20;
const QRgb OSDPretty::kPresetBlue = qRgb(102, 150, 227);
const QRgb OSDPretty::kPresetRed = qRgb(202, 22, 16);
OSDPretty::OSDPretty(Mode mode, QWidget *parent)
: QWidget(parent),
ui_(new Ui_OSDPretty),
@@ -219,9 +216,7 @@ void OSDPretty::ScreenRemoved(QScreen *screen) {
bool OSDPretty::IsTransparencyAvailable() {
#ifdef HAVE_X11EXTRAS
return QX11Info::isCompositingManagerRunning();
#elif defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
#ifdef HAVE_QPA_QPLATFORMNATIVEINTERFACE_H
if (qApp) {
QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface();
QScreen *screen = popup_screen_ == nullptr ? QGuiApplication::primaryScreen() : popup_screen_;