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

reimplements the fade out/in on slide changes for transition between two identical slides.

Browse Source 
bzr-revno: 2172
Fixes: https://launchpad.net/bugs/1223841
This commit is contained in:
Oliver Wieland 2013-10-21 09:43:39 +02:00 committed by Andreas Preikschat
commit 35305ae322
1 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,9 +129,10 @@ sup {
} }
function show_text(newtext){ function show_text(newtext){
var fade_direction = 0;
var match = /-webkit-text-fill-color:[^;\"]+/gi; var match = /-webkit-text-fill-color:[^;\"]+/gi;
if(timer != null) if (timer != null)
clearTimeout(timer); clearInterval(timer);
/* /*
QtWebkit bug with outlines and justify causing outline alignment QtWebkit bug with outlines and justify causing outline alignment
problems. (Bug 859950) Surround each word with a <span> to workaround, problems. (Bug 859950) Surround each word with a <span> to workaround,
@ -150,39 +151,45 @@ sup {
newtext = '<span>' + newtext + '</span>'; newtext = '<span>' + newtext + '</span>';
} }
} }
text_fade('lyricsmain', newtext); text_fade('lyricsmain', newtext);
text_fade('lyricsoutline', newtext); text_fade('lyricsoutline', newtext);
text_fade('lyricsshadow', newtext.replace(match, '')); text_fade('lyricsshadow', newtext.replace(match, ''));
if(text_opacity() == 1) return; if(text_opacity() == 1) return;
timer = setTimeout(function(){ timer = setInterval(function(){
show_text(newtext); text_fade('lyricsmain', newtext);
text_fade('lyricsoutline', newtext);
text_fade('lyricsshadow', newtext.replace(match, ''));
if(text_opacity() == 1) clearInterval(timer);
}, 100); }, 100);
}
function text_fade(id, newtext){ function text_fade(id, newtext){
/* /*
Using -webkit-transition: opacity 1s linear; would have been preferred Using -webkit-transition: opacity 1s linear; would have been preferred
but it isn't currently quick enough when animating multiple layers of but it isn't currently quick enough when animating multiple layers of
large areas of large text. Therefore do it manually as best we can. large areas of large text. Therefore do it manually as best we can.
Hopefully in the future we can revisit and do more interesting Hopefully in the future we can revisit and do more interesting
transitions using -webkit-transition and -webkit-transform. transitions using -webkit-transition and -webkit-transform.
However we need to ensure interrupted transitions (quickly change 2 However we need to ensure interrupted transitions (quickly change 2
slides) still looks pretty and is zippy. slides) still looks pretty and is zippy.
*/ */
var text = document.getElementById(id); var text = document.getElementById(id);
if(text == null) return; if(text == null) return;
if(!transition){ if(!transition){
text.innerHTML = newtext;
return;
}
if(newtext == text.innerHTML){
text.style.opacity = parseFloat(text.style.opacity) + 0.3;
if(text.style.opacity > 0.7)
text.style.opacity = 1;
} else {
text.style.opacity = parseFloat(text.style.opacity) - 0.3;
if(text.style.opacity <= 0.1){
text.innerHTML = newtext; text.innerHTML = newtext;
return;
}
if(fade_direction != 1){
text.style.opacity = parseFloat(text.style.opacity) - 0.3;
if(text.style.opacity <= 0.1){
text.innerHTML = newtext;
fade_direction = 1;
}
}else{
text.style.opacity = parseFloat(text.style.opacity) + 0.3;
if(text.style.opacity > 0.7){
text.style.opacity = 1;
}
} }
} }
} }