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

replace evil-tables(tm) with div's

Browse Source
This commit is contained in:
Jonathan Corwin 2010-09-01 22:36:02 +01:00
parent 0c62215bb7
commit a9281e4cb9
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,22 +195,23 @@ body {
function text_fade(id, newtext){ function text_fade(id, newtext){
var text = document.getElementById(id); var text = document.getElementById(id);
if(!transition){ if(!transition){
text.innerHTML = newtext; text.innerHTML = newtext;
return; return;
} }
if(text.style.opacity=='') text.style.opacity = 1; if(text.style.opacity=='') text.style.opacity = 1;
if(newtext==text.innerHTML){ if(newtext==text.innerHTML){
text.style.opacity = parseFloat(text.style.opacity) + 0.3; text.style.opacity = parseFloat(text.style.opacity) + 0.3;
} else { } else {
text.style.opacity -= 0.3; text.style.opacity -= 0.3;
if(text.style.opacity<=0.1) if(text.style.opacity<=0.1){
text.innerHTML = newtext; text.innerHTML = newtext;
}
} }
} }
function text_opacity(){ function text_opacity(){
var text = document.getElementById('lyricsmain'); var text = document.getElementById('lyricsmain');
return window.getComputedStyle(text, '').opacity; return getComputedStyle(text, '').opacity;
} }
function show_text_complete(){ function show_text_complete(){
return (text_opacity()==1); return (text_opacity()==1);
@ -219,24 +220,25 @@ body {
</head> </head>
<body> <body>
<!-- <!--
Using tables, rather than div's to make use of the vertical-align style that Would prefer to use a single div and make use of -webkit-text-fill-color
doesn't work on div's. This avoids the need to do positioning manually which
could get messy when changing verses esp. with transitions
Would prefer to use a single table and make use of -webkit-text-fill-color
-webkit-text-stroke and text-shadow styles, but they have problems working/ -webkit-text-stroke and text-shadow styles, but they have problems working/
co-operating in qwebkit. https://bugs.webkit.org/show_bug.cgi?id=43187 co-operating in qwebkit. https://bugs.webkit.org/show_bug.cgi?id=43187
Therefore one table for text, one for outline and one for shadow. Therefore one for text, one for outline and one for shadow.
Note, the webkit fill problem is fixed in 433.3 and the shadow problem looks
as though it'll be fixed in QtWebkit 2.1 (434.3)
There is an alignment problem with fills in 433.3 however requiring a hack
by setting letter spacing. This is also fixed in v434.3
--> -->
<table class="lyricstable lyricscommon"> <div class="lyricstable lyricscommon">
<tr><td id="lyricsmain" class="lyrics"></td></tr> <div id="lyricsmain" class="lyrics"></div>
</table> </div>
<table class="lyricsoutlinetable lyricscommon"> <div class="lyricsoutlinetable lyricscommon">
<tr><td id="lyricsoutline" class="lyricsoutline lyrics"></td></tr> <div id="lyricsoutline" class="lyricsoutline lyrics"></div>
</table> </div>
<table class="lyricsshadowtable lyricscommon"> <div class="lyricsshadowtable lyricscommon">
<tr><td id="lyricsshadow" class="lyricsshadow lyrics"></td></tr> <div id="lyricsshadow" class="lyricsshadow lyrics"></div>
</table> </div>
<div id="alert" style="visibility:hidden;"></div> <div id="alert" style="visibility:hidden;"></div>
<div id="footer" class="footer"></div> <div id="footer" class="footer"></div>
<video class="dim" id="video"></video> <video class="dim" id="video"></video>
@ -298,7 +300,7 @@ def build_lyrics(item):
outline = u'display: none;' outline = u'display: none;'
shadow = u'display: none;' shadow = u'display: none;'
if theme: if theme:
lyricscommon = u'width: %spx; height: %spx; word-wrap: break-word; ' \ lyricscommon = u'display: table; width: %spx; height: %spx; word-wrap: break-word; ' \
u'font-family: %s; font-size: %spt; color: %s; line-height: %d%%;' \ u'font-family: %s; font-size: %spt; color: %s; line-height: %d%%;' \
% (item.main.width(), item.main.height(), theme.font_main_name, % (item.main.width(), item.main.height(), theme.font_main_name,
theme.font_main_proportion, theme.font_main_color, theme.font_main_proportion, theme.font_main_color,
@ -323,7 +325,7 @@ def build_lyrics(item):
valign = u'vertical-align:middle;' valign = u'vertical-align:middle;'
else: else:
valign = u'vertical-align:top;' valign = u'vertical-align:top;'
lyrics = u'%s %s' % (align, valign) lyrics = u'display:table-cell; %s %s' % (align, valign)
if theme.display_outline: if theme.display_outline:
lyricscommon += u' letter-spacing: 1px;' lyricscommon += u' letter-spacing: 1px;'
outline = u'-webkit-text-stroke: %sem %s; ' % \ outline = u'-webkit-text-stroke: %sem %s; ' % \