forked from openlp/openlp
Fix bug #606437
This commit is contained in:
parent
103cc83960
commit
885e5d8ea2
|
@ -264,6 +264,10 @@ class MainDisplay(DisplayWidget):
|
||||||
(self.screen[u'size'].width() - splash_image.width()) / 2,
|
(self.screen[u'size'].width() - splash_image.width()) / 2,
|
||||||
(self.screen[u'size'].height() - splash_image.height()) / 2,
|
(self.screen[u'size'].height() - splash_image.height()) / 2,
|
||||||
splash_image)
|
splash_image)
|
||||||
|
#build a blank transparent image
|
||||||
|
self.transparent = QtGui.QPixmap(
|
||||||
|
self.screen[u'size'].width(), self.screen[u'size'].height())
|
||||||
|
self.transparent.fill(QtCore.Qt.transparent)
|
||||||
self.displayImage(self.initialFrame)
|
self.displayImage(self.initialFrame)
|
||||||
self.repaint()
|
self.repaint()
|
||||||
#Build a Black screen
|
#Build a Black screen
|
||||||
|
@ -274,12 +278,6 @@ class MainDisplay(DisplayWidget):
|
||||||
QtGui.QImage.Format_ARGB32_Premultiplied)
|
QtGui.QImage.Format_ARGB32_Premultiplied)
|
||||||
painter.begin(self.blankFrame)
|
painter.begin(self.blankFrame)
|
||||||
painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
|
painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
|
||||||
#build a blank transparent image
|
|
||||||
self.transparent = QtGui.QPixmap(
|
|
||||||
self.screen[u'size'].width(), self.screen[u'size'].height())
|
|
||||||
self.transparent.fill(QtCore.Qt.transparent)
|
|
||||||
# self.displayText.setPixmap(self.transparent)
|
|
||||||
#self.frameView(self.transparent)
|
|
||||||
# To display or not to display?
|
# To display or not to display?
|
||||||
if not self.screen[u'primary']:
|
if not self.screen[u'primary']:
|
||||||
self.setVisible(True)
|
self.setVisible(True)
|
||||||
|
@ -410,6 +408,7 @@ class MainDisplay(DisplayWidget):
|
||||||
self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
|
self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
|
||||||
else:
|
else:
|
||||||
self.imageDisplay.setPixmap(frame)
|
self.imageDisplay.setPixmap(frame)
|
||||||
|
self.frameView(self.transparent)
|
||||||
self.videoDisplay.setHtml(u'<html></html>')
|
self.videoDisplay.setHtml(u'<html></html>')
|
||||||
|
|
||||||
def displayVideo(self, path):
|
def displayVideo(self, path):
|
||||||
|
|
Loading…
Reference in New Issue