summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylanddisplay.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-09-05 13:46:56 +0200
committerLaszlo Agocs <laszlo.agocs@digia.com>2014-09-06 20:46:57 +0200
commit6d43b06d2b8f101f72d798d10e692fa134963849 (patch)
treef9534a67cab8313c98a5424318ab800957dfa226 /src/client/qwaylanddisplay.cpp
parent73151fc07b78a52ee4887fa8325bc4e582320c73 (diff)
Fix window decorations for GL apps
You cannot have rounded corners with an alpha-less config. To make OpenGL applications appearing with the correct decoration, alpha must be enabled. With this fix the OpenGL apps' decoration will now look identical to the SHM apps'. Change-Id: I24431ddab63146f7f697c85277f00f41e5c55e85 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
-rw-r--r--src/client/qwaylanddisplay.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 264528f6c..3eac985f6 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -56,6 +56,7 @@
#include "qwaylandwindowmanagerintegration_p.h"
#include "qwaylandshellintegration_p.h"
+#include "qwaylandclientbufferintegration_p.h"
#include "qwaylandextendedoutput_p.h"
#include "qwaylandextendedsurface_p.h"
@@ -335,4 +336,16 @@ QtWayland::xdg_shell *QWaylandDisplay::shellXdg()
return mShellXdg.data();
}
+bool QWaylandDisplay::supportsWindowDecoration() const
+{
+ static bool disabled = qgetenv("QT_WAYLAND_DISABLE_WINDOWDECORATION").toInt();
+ // Stop early when disabled via the environment. Do not try to load the integration in
+ // order to play nice with SHM-only, buffer integration-less systems.
+ if (disabled)
+ return false;
+
+ static bool integrationSupport = clientBufferIntegration() && clientBufferIntegration()->supportsWindowDecoration();
+ return integrationSupport;
+}
+
QT_END_NAMESPACE