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

Remove use of X11Extras and WinExtras

Browse Source 
Modules are deprecated in Qt 6
See: QTBUG-83251
This commit is contained in:
jonas@jkvinge.net
2021-05-12 20:08:06 +02:00
parent a01541d7ca
commit efcd35d4a1
14 changed files with 160 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/osd/osdpretty.cpp
View File

@@ -53,14 +53,9 @@
#include <QSettings>
#include <QFlags>
#include <QtEvents>
#ifdef HAVE_X11EXTRAS
# include <QX11Info>
#elif defined(Q_OS_UNIX) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
#if defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
# include <qpa/qplatformnativeinterface.h>
#endif
#ifdef HAVE_WINEXTRAS
# include <QtWin>
#endif
#include "osdpretty.h"
#include "ui_osdpretty.h"
@@ -69,6 +64,8 @@
# include <windows.h>
#endif
#include "core/utilities.h"
const char *OSDPretty::kSettingsGroup = "OSDPretty";
const int OSDPretty::kDropShadowSize = 13;
@@ -213,21 +210,14 @@ void OSDPretty::ScreenRemoved(QScreen *screen) {
bool OSDPretty::IsTransparencyAvailable() {
#if defined(HAVE_X11EXTRAS)
return QX11Info::isCompositingManagerRunning();
#elif defined(Q_OS_UNIX) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
#if defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
if (qApp) {
QPlatformNativeInterface *native = qApp->platformNativeInterface();
if (native) {
QScreen *screen = popup_screen_ == nullptr ? QGuiApplication::primaryScreen() : popup_screen_;
if (screen) {
return native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen);
}
else return false;
QScreen *screen = popup_screen_ == nullptr ? QGuiApplication::primaryScreen() : popup_screen_;
if (native && screen) {
return native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen);
}
else return false;
}
else return false;
#endif
return true;
@@ -452,9 +442,9 @@ void OSDPretty::Reposition() {
setMask(mask);
}
#ifdef HAVE_WINEXTRAS
// On windows, enable blurbehind on the masked area
QtWin::enableBlurBehindWindow(this, QRegion(mask));
#ifdef Q_OS_WIN
Utilities::enableBlurBehindWindow(this->windowHandle(), QRegion(mask));
#endif
}
@@ -607,4 +597,3 @@ void OSDPretty::set_font(QFont font) {
Reposition();
}