openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/render into lp:~trb143/openlp/renderer.

Requested reviews:
  OpenLP Core (openlp-core)


Fix shadow colour if using qtwebkit 533.3
Workaround kerning bug in qtwebkit 533.3 if outlines used.

Merge request for Tim's renderer branch.
-- 
https://code.launchpad.net/~j-corwin/openlp/render/+merge/33975
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/render into lp:~trb143/openlp/renderer.

=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py	2010-08-27 18:28:19 +0000
+++ openlp/core/lib/htmlbuilder.py	2010-08-27 23:29:42 +0000
@@ -343,7 +343,7 @@
     shadow = u'display: none;'
     if theme:
         lyricscommon =  u'width: %spx; height: %spx; word-wrap: break-word;  ' \
-            u'font-family: %s; font-size: %spx; color: %s; line-height: %d%%' % \
+            u'font-family: %s; font-size: %spx; color: %s; line-height: %d%%;' % \
             (item.main.width(), item.main.height(),
             theme.font_main_name, theme.font_main_proportion,
             theme.font_main_color, 100 + int(theme.font_main_line_adjustment))
@@ -369,13 +369,15 @@
             valign = u'vertical-align:top;'
         lyrics = u'%s %s' % (align, valign)
         if theme.display_outline:
+            lyricscommon += u' letter-spacing: 1px;'
             outline = u'-webkit-text-stroke: %sem %s; ' % \
                 (float(theme.display_outline_size) / 16,
                 theme.display_outline_color)
             if theme.display_shadow:
-                shadow = u'-webkit-text-stroke: %sem %s; ' % \
+                shadow = u'-webkit-text-stroke: %sem %s; ' \
+                    u'-webkit-text-fill-color: %s; '% \
                     (float(theme.display_outline_size) / 16,
-                    theme.display_shadow_color)
+                    theme.display_shadow_color, theme.display_shadow_color)
         else:
             if theme.display_shadow:
                 shadow = u'color: %s;' % (theme.display_shadow_color)