raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix auto unblank

This commit is contained in:
Daniel Martin 2021-01-30 05:59:56 +00:00 committed by Raoul Snyman
parent c7112a1f78
commit ed129b8923
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/core/display/html/display.js
View File

@ -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]);

4
openlp/core/ui/slidecontroller.py
View File

@ -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():

2
tests/functional/openlp_core/ui/test_slidecontroller.py
View File

@ -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()