From ed129b89239f3b91dbd8b1d1b679b5e046eebe3a Mon Sep 17 00:00:00 2001 From: Daniel Martin Date: Sat, 30 Jan 2021 05:59:56 +0000 Subject: [PATCH] Fix auto unblank --- openlp/core/display/html/display.js | 1 - openlp/core/ui/slidecontroller.py | 4 +++- tests/functional/openlp_core/ui/test_slidecontroller.py | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/openlp/core/display/html/display.js b/openlp/core/display/html/display.js index c7e252da4..3aa9a75b6 100644 --- a/openlp/core/display/html/display.js +++ b/openlp/core/display/html/display.js @@ -1099,7 +1099,6 @@ var Display = { footerStyle["font-style"] = !!Display._theme.font_footer_italics ? "italic" : ""; footerStyle["font-weight"] = !!Display._theme.font_footer_bold ? "bold" : ""; footerStyle["white-space"] = Display._theme.font_footer_wrap ? "normal" : "nowrap"; - Display._footerContainer.style.cssText = ""; for (var footerKey in footerStyle) { if (footerStyle.hasOwnProperty(footerKey)) { Display._footerContainer.style.setProperty(footerKey, footerStyle[footerKey]); diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 93cddfdc8..efa20bd40 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -1013,6 +1013,8 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): self.application.process_events() self.ignore_toolbar_resize_events = False self.on_controller_size_changed() + if self.settings.value('core/auto unblank'): + self.set_hide_mode(None) self.log_debug('_process_item end') def on_slide_selected_index(self, message): @@ -1489,7 +1491,7 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): Triggered when a preview slide item is double clicked """ if self.service_item: - if self.settings.value('advanced/double click live') and self.settings.value('core/auto unblank'): + if self.settings.value('advanced/double click live'): # Live and Preview have issues if we have video or presentations # playing in both at the same time. if self.service_item.is_command(): diff --git a/tests/functional/openlp_core/ui/test_slidecontroller.py b/tests/functional/openlp_core/ui/test_slidecontroller.py index 8ff1b8926..e398d7bb8 100644 --- a/tests/functional/openlp_core/ui/test_slidecontroller.py +++ b/tests/functional/openlp_core/ui/test_slidecontroller.py @@ -947,6 +947,7 @@ def test_process_item_transition(mocked_execute, registry, state_media): slide_controller.on_media_start = MagicMock() slide_controller.on_media_close = MagicMock() slide_controller.slide_selected = MagicMock() + slide_controller.set_hide_mode = MagicMock() slide_controller.new_song_menu = MagicMock() slide_controller.on_stop_loop = MagicMock() slide_controller.info_label = MagicMock() @@ -1007,6 +1008,7 @@ def test_process_item_text(mocked_execute, registry, state_media): slide_controller.on_media_start = MagicMock() slide_controller.on_media_close = MagicMock() slide_controller.slide_selected = MagicMock() + slide_controller.set_hide_mode = MagicMock() slide_controller.new_song_menu = MagicMock() slide_controller.on_stop_loop = MagicMock() slide_controller.info_label = MagicMock()