openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

fixed maindisplay opening again

This commit is contained in:
Andreas Preikschat 2013-03-05 18:08:15 +01:00
parent 50538d66db
commit 33db8e143b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/lib/htmlbuilder.py
View File

@ -182,8 +182,9 @@ sup {
*/ */
text.innerHTML = new_text; text.innerHTML = new_text;
text.style.opacity = '1'; text.style.opacity = '1';
// Wait until the text is completely visible. // Wait until the text is completely visible. We want to save the timer id, to be able to call
window.setTimeout(function(){timer = null;}, 400); // clearTimeout(timer) when the text has changed before finishing fading.
timer = window.setTimeout(function(){timer = null;}, 400);
} }
function show_text_completed(){ function show_text_completed(){

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

@ -346,6 +346,7 @@ class MainDisplay(Display):
""" """
Generates a preview of the image displayed. Generates a preview of the image displayed.
""" """
was_visible = self.isVisible()
log.debug(u'preview for %s', self.isLive) log.debug(u'preview for %s', self.isLive)
self.application.process_events() self.application.process_events()
# We must have a service item to preview. # We must have a service item to preview.
@ -363,7 +364,8 @@ class MainDisplay(Display):
if self.isLive: if self.isLive:
if self.hideMode: if self.hideMode:
self.hide_display(self.hideMode) self.hide_display(self.hideMode)
else: # Only continue if the visibility wasn't changed during method call.
elif was_visible == self.isVisible():
# Single screen active # Single screen active
if self.screens.display_count == 1: if self.screens.display_count == 1:
# Only make visible if setting enabled. # Only make visible if setting enabled.