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

Remove builtin qtwin and use WinExtras, replace some macros

Browse Source
This commit is contained in:
Jonas Kvinge
2018-09-15 13:07:51 +02:00
parent 072facdf7b
commit 6563bec7e4
16 changed files with 50 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/osdpretty.cpp
View File

@@ -49,15 +49,17 @@
#include <QSettings>
#include <QFlags>
#include <QtEvents>
#ifdef Q_WS_X11
#ifdef HAVE_X11
# include <QX11Info>
#endif
#ifdef Q_OS_WIN
# include <QtWin>
#endif
#include "osdpretty.h"
#include "ui_osdpretty.h"
#ifdef Q_OS_WIN32
# include "qtwin.h"
#ifdef Q_OS_WIN
# include <windows.h>
#endif
@@ -160,7 +162,7 @@ OSDPretty::~OSDPretty() {
}
bool OSDPretty::IsTransparencyAvailable() {
#ifdef Q_WS_X11
#ifdef HAVE_X11
return QX11Info::isCompositingManagerRunning();
#endif
return true;
@@ -366,7 +368,7 @@ void OSDPretty::Reposition() {
#ifdef Q_OS_WIN32
// On windows, enable blurbehind on the masked area
QtWin::enableBlurBehindWindow(this, true, QRegion(mask));
QtWin::enableBlurBehindWindow(this, QRegion(mask));
#endif
}