From cd8e96b6a3522a6793a4b818de325b1a90162d19 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 7 May 2011 17:51:44 +0200
Subject: [PATCH] Fixed the order of components which need to update their
 screen information

---
 openlp/core/lib/imagemanager.py   | 7 ++++---
 openlp/core/lib/renderer.py       | 1 -
 openlp/core/ui/mainwindow.py      | 3 +++
 openlp/core/ui/slidecontroller.py | 2 --
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index f144248ed..f06dc2767 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -79,13 +79,14 @@ class ImageManager(QtCore.QObject):
         self._cache_dirty = False
         self.image_thread = ImageThread(self)
 
-    def update_display(self, width, height):
+    def update_display(self):
         """
         Screen has changed size so rebuild the cache to new size
         """
         log.debug(u'update_display')
-        self.width = width
-        self.height = height
+        current_screen = ScreenList.get_instance().current
+        self.width = current_screen[u'size'].width()
+        self.height = current_screen[u'size'].height()
         # mark the images as dirty for a rebuild
         for key in self._cache.keys():
             image = self._cache[key]
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 431e3cd97..0eb9eabd1 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -85,7 +85,6 @@ class Renderer(object):
         self.display.setup()
         self.bg_frame = None
         self.theme_data = None
-        self.image_manager.update_display(self.width, self.height)
 
     def set_global_theme(self, global_theme, theme_level=ThemeLevel.Global):
         """
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index cf5926793..5a94f8f75 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -777,7 +777,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         their locations
         """
         log.debug(u'screenChanged')
+        self.image_manager.update_display()
         self.renderer.update_display()
+        self.liveController.screenSizeChanged()
+        self.previewController.screenSizeChanged()
         self.setFocus()
         self.activateWindow()
 
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index a526d99fa..c14380d4d 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -366,8 +366,6 @@ class SlideController(QtGui.QWidget):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'slidecontroller_%s_text_request' % self.typePrefix),
             self.onTextRequest)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'config_screen_changed'), self.screenSizeChanged)
 
     def setPreviewHotkeys(self, parent=None):
         self.previousItem.setObjectName(u'previousItemPreview')