forked from openlp/openlp
Fix bug #1041366: Specified size display area not working.
Fixes: https://launchpad.net/bugs/1041366
This commit is contained in:
parent
afc7ce6b2a
commit
72d842a2aa
@ -96,6 +96,7 @@ class Renderer(object):
|
|||||||
self.display.close()
|
self.display.close()
|
||||||
self.display = MainDisplay(None, self.image_manager, False, self)
|
self.display = MainDisplay(None, self.image_manager, False, self)
|
||||||
self.display.setup()
|
self.display.setup()
|
||||||
|
#self.web_frame = self.web.page().mainFrame()
|
||||||
self._theme_dimensions = {}
|
self._theme_dimensions = {}
|
||||||
|
|
||||||
def update_theme(self, theme_name, old_theme_name=None, only_delete=False):
|
def update_theme(self, theme_name, old_theme_name=None, only_delete=False):
|
||||||
@ -406,7 +407,14 @@ class Renderer(object):
|
|||||||
if theme_data.font_main_shadow:
|
if theme_data.font_main_shadow:
|
||||||
self.page_width -= int(theme_data.font_main_shadow_size)
|
self.page_width -= int(theme_data.font_main_shadow_size)
|
||||||
self.page_height -= 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.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.
|
# Adjust width and height to account for shadow. outline done in css.
|
||||||
html = u"""<!DOCTYPE html><html><head><script>
|
html = u"""<!DOCTYPE html><html><head><script>
|
||||||
function show_text(newtext) {
|
function show_text(newtext) {
|
||||||
|
Loading…
Reference in New Issue
Block a user