raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Disable OpenGL in the maindisplay on windows for now.

Browse Source
This commit is contained in:
Tomas Groth 2016-01-08 22:43:43 +01:00
parent b5270b48a9
commit 43e273c4ed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/core/ui/maindisplay.py
View File

@ -34,7 +34,7 @@ import logging
from PyQt5 import QtCore, QtWidgets, QtWebKit, QtWebKitWidgets, QtOpenGL, QtGui, QtMultimedia
from openlp.core.common import Registry, RegistryProperties, OpenLPMixin, Settings, translate, is_macosx
from openlp.core.common import Registry, RegistryProperties, OpenLPMixin, Settings, translate, is_macosx, is_win
from openlp.core.lib import ServiceItem, ImageSource, ScreenList, build_html, expand_tags, image_to_byte
from openlp.core.lib.theme import BackgroundType
from openlp.core.ui import HideMode, AlertLocation
@ -90,7 +90,7 @@ class Display(QtWidgets.QGraphicsView):
# OpenGL. Only white blank screen is shown on the 2nd monitor all the
# time. We need to investigate more how to use OpenGL properly on Mac OS
# X.
if not is_macosx():
if not is_macosx() and not is_win():
self.setViewport(QtOpenGL.QGLWidget())
def setup(self):
@ -121,7 +121,8 @@ class Display(QtWidgets.QGraphicsView):
:param event: The event to be handled
"""
self.web_view.setGeometry(0, 0, self.width(), self.height())
if hasattr(self, 'web_view'):
self.web_view.setGeometry(0, 0, self.width(), self.height())
def is_web_loaded(self, field=None):
"""