From e54f4eec7b84408c8facb36133cc902e80b3a7e2 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 26 Dec 2012 12:20:30 +0000 Subject: [PATCH] Interface unusable when run on XFce --- openlp/core/ui/advancedtab.py | 3 +++ openlp/core/ui/maindisplay.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 193fc63d7..bf1fe2662 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -499,6 +499,9 @@ class AdvancedTab(SettingsTab): # Default to False on Gnome. x11_bypass_default = bool(not os.environ.get(u'GNOME_DESKTOP_SESSION_ID')) + # Default to False on XFce + if os.environ.get(u'DESKTOP_SESSION') == u'xfce': + x11_bypass_default = False self.x11BypassCheckBox.setChecked(settings.value( u'x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool()) self.defaultColor = settings.value(u'default color', diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 5302e8413..f5aa34762 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -143,6 +143,9 @@ class MainDisplay(Display): # Default to False on Gnome. x11_bypass_default = bool(not os.environ.get(u'GNOME_DESKTOP_SESSION_ID')) + # Default to False on XFce + if os.environ.get(u'DESKTOP_SESSION') == u'xfce': + x11_bypass_default = False if Settings().value(u'advanced/x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool(): windowFlags |= QtCore.Qt.X11BypassWindowManagerHint