From af9e9641c498decbe17a1d9e78f321674ac2f0f7 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 12 Jan 2011 18:52:16 +0000 Subject: [PATCH] Fix black background on Display resizing Fixes: https://launchpad.net/bugs/696557 --- openlp/core/lib/imagemanager.py | 5 ++--- openlp/core/ui/maindisplay.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py index 0be1a01c8..dcfc50f0f 100644 --- a/openlp/core/lib/imagemanager.py +++ b/openlp/core/lib/imagemanager.py @@ -86,8 +86,7 @@ class ImageManager(QtCore.QObject): for key in self._cache.keys(): image = self._cache[key] image.dirty = True - fullpath = os.path.join(image.path, image.name) - image.image = resize_image(fullpath, + image.image = resize_image(image.path, self.width, self.height) self._cache_dirty = True # only one thread please @@ -165,4 +164,4 @@ class ImageManager(QtCore.QObject): image = self._cache[key] if image.dirty: image.image_bytes = image_to_byte(image.image) - image.dirty = False \ No newline at end of file + image.dirty = False diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index adc2cb5fa..ab69cd1e9 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -198,7 +198,7 @@ class MainDisplay(DisplayWidget): The slide text to be displayed """ log.debug(u'text to display') - # Wait for the webview to update before displayiong text. + # Wait for the webview to update before displaying text. while not self.loaded: Receiver.send_message(u'openlp_process_events') self.frame.evaluateJavaScript(u'show_text("%s")' % \