openlp-core team mailing list archive

[matysek <mzibricky@xxxxxxxxx>]

matysek has proposed merging lp:~mzibricky/openlp/bug-906926 into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)
  Andreas Preikschat (googol)
Related bugs:
  Bug #906926 in OpenLP: "Display screen doesn't "stay on top" in OS X"
  https://bugs.launchpad.net/openlp/+bug/906926

For more details, see:
https://code.launchpad.net/~mzibricky/openlp/bug-906926/+merge/86736

This fixes bug #906926.

uses sys.platform and updated for latest trunk.
-- 
https://code.launchpad.net/~mzibricky/openlp/bug-906926/+merge/86736
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-12-22 13:23:04 +0000
+++ openlp/core/ui/maindisplay.py	2011-12-22 18:35:31 +0000
@@ -30,6 +30,7 @@
 """
 import logging
 import os
+import sys
 
 from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
 from PyQt4.phonon import Phonon
@@ -125,6 +126,11 @@
                 QtCore.Qt.WindowStaysOnTopHint
         if os.environ.get(u'XDG_CURRENT_DESKTOP') == u'Unity':
             windowFlags = windowFlags | QtCore.Qt.X11BypassWindowManagerHint
+        # FIXME: QtCore.Qt.SplashScreen is workaround to make display screen
+        # stay always on top on Mac OS X. For details see bug 906926.
+        # It needs more investigation to fix it properly.
+        if sys.platform == 'darwin':
+            windowFlags = windowFlags | QtCore.Qt.SplashScreen
         self.setWindowFlags(windowFlags)
         self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
         if self.isLive: