From 244d0a2701e01adf8e66b8d9089fa2e006d1e55d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 16 Apr 2020 19:36:59 +0530 Subject: [PATCH] Fix #1872518 [[Enhancement] Hide shown pages when clicking in the viewer toolbar](https://bugs.launchpad.net/calibre/+bug/1872518) --- src/calibre/gui2/viewer/toolbars.py | 2 +- src/pyj/read_book/view.pyj | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py index 2456ec3797..0f8fe365d0 100644 --- a/src/calibre/gui2/viewer/toolbars.py +++ b/src/calibre/gui2/viewer/toolbars.py @@ -59,7 +59,7 @@ def all_actions(): 'reference': Action('reference.png', _('Toggle Reference mode'), 'toggle_reference_mode'), 'autoscroll': Action('auto-scroll.png', _('Toggle auto-scrolling'), 'toggle_autoscroll'), 'lookup': Action('generic-library.png', _('Lookup words'), 'toggle_lookup'), - 'chrome': Action('tweaks.png', _('Show viewer controls'), 'show_chrome'), + 'chrome': Action('tweaks.png', _('Show viewer controls'), 'show_chrome_force'), 'mode': Action('scroll.png', _('Toggle paged mode'), 'toggle_paged_mode'), 'print': Action('print.png', _('Print book'), 'print'), 'preferences': Action('config.png', _('Preferences'), 'preferences'), diff --git a/src/pyj/read_book/view.pyj b/src/pyj/read_book/view.pyj index 4c8d53164e..4ead044d8a 100644 --- a/src/pyj/read_book/view.pyj +++ b/src/pyj/read_book/view.pyj @@ -421,6 +421,8 @@ class View: window.history.forward() elif data.name is 'show_chrome': self.show_chrome() + elif data.name is 'show_chrome_force': + self.show_chrome_force() elif data.name is 'toggle_toc': ui_operations.toggle_toc() elif data.name is 'toggle_bookmarks': @@ -590,6 +592,10 @@ class View: initial_panel = data?.initial_panel or None self.get_current_cfi('show-chrome', self.do_show_chrome.bind(None, elements, initial_panel)) + def show_chrome_force(self): + self.hide_overlays() + self.show_chrome() + def do_show_chrome(self, elements, initial_panel, request_id, cfi_data): self.hide_overlays() self.update_cfi_data(cfi_data)