From 56f4b8aa5e792f7b22dcce184db0cc411ccec375 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sat, 6 Dec 2014 20:40:40 +0000 Subject: [PATCH] Another fix for blank menu. --- openlp/core/ui/slidecontroller.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 3d9d8b29c..784cc1ea6 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -141,7 +141,7 @@ class SlideController(DisplayController, RegistryProperties): self.slide_list = {} self.slide_count = 0 self.slide_image = None - self.controller_width = 0 + self.controller_width = -1 # Layout for holding panel self.panel_layout = QtGui.QVBoxLayout(self.panel) self.panel_layout.setSpacing(0) @@ -619,6 +619,7 @@ class SlideController(DisplayController, RegistryProperties): self.toolbar.set_widget_visible(NARROW_MENU) # Fallback to the standard blank toolbar if the hide_menu is not visible. elif not self.hide_menu.isVisible(): + self.toolbar.set_widget_visible(NARROW_MENU, False) self.set_blank_menu() def set_blank_menu(self, visible=True): @@ -694,7 +695,9 @@ class SlideController(DisplayController, RegistryProperties): self.mediabar.show() self.previous_item.setVisible(not item.is_media()) self.next_item.setVisible(not item.is_media()) - # The layout of the toolbar is size dependent, so make sure it fits + # The layout of the toolbar is size dependent, so make sure it fits. Reset stored controller_width. + if self.is_live: + self.controller_width = -1 self.on_controller_size_changed(self.controller.width()) # Work-around for OS X, hide and then show the toolbar # See bug #791050