openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #16894
[Merge] lp:~raoul-snyman/openlp/bug-1041366 into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-1041366 into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1041366 in OpenLP: "Specified size display area not working"
https://bugs.launchpad.net/openlp/+bug/1041366
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-1041366/+merge/121285
Put the old code back in.
--
https://code.launchpad.net/~raoul-snyman/openlp/bug-1041366/+merge/121285
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-1041366 into lp:openlp.
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py 2012-07-02 18:45:03 +0000
+++ openlp/core/lib/renderer.py 2012-08-24 20:57:19 +0000
@@ -96,6 +96,7 @@
self.display.close()
self.display = MainDisplay(None, self.image_manager, False, self)
self.display.setup()
+ #self.web_frame = self.web.page().mainFrame()
self._theme_dimensions = {}
def update_theme(self, theme_name, old_theme_name=None, only_delete=False):
@@ -406,7 +407,14 @@
if theme_data.font_main_shadow:
self.page_width -= int(theme_data.font_main_shadow_size)
self.page_height -= int(theme_data.font_main_shadow_size)
+ # For the life of my I don't know why we have to completely kill the
+ # QWebView in order for the display to work properly, but we do. See
+ # bug #1041366 for an example of what happens if we take this out.
+ self.web = None
+ self.web = QtWebKit.QWebView()
+ self.web.setVisible(False)
self.web.resize(self.page_width, self.page_height)
+ self.web_frame = self.web.page().mainFrame()
# Adjust width and height to account for shadow. outline done in css.
html = u"""<!DOCTYPE html><html><head><script>
function show_text(newtext) {
Follow ups
