Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Server viewer: Make exit fullscreen action available in viewer controls. Fixes #1857677 [Add Exit full screen option in Content server controls](https://bugs.launchpad.net/calibre/+bug/1857677)

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-27 15:21:32 +05:30
parent 1044fb014c
commit 8c53305a4c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pyj/read_book/overlay.pyj
View File

@ -19,7 +19,9 @@ from read_book.prefs.main import create_prefs_panel
from read_book.toc import create_toc_panel from read_book.toc import create_toc_panel
from read_book.word_actions import create_word_actions_panel from read_book.word_actions import create_word_actions_panel
from session import get_device_uuid from session import get_device_uuid
from utils import full_screen_element, is_ios, safe_set_inner_html from utils import (
full_screen_element, full_screen_supported, is_ios, safe_set_inner_html
)
from widgets import create_button, create_spinner from widgets import create_button, create_spinner
@ -288,10 +290,11 @@ class MainOverlay: # {{{
full_screen_actions.push( full_screen_actions.push(
ac(_('Print'), _('Print book to PDF'), def(): self.overlay.hide(), ui_operations.print_book();, 'print')) ac(_('Print'), _('Print book to PDF'), def(): self.overlay.hide(), ui_operations.print_book();, 'print'))
else: else:
if not full_screen_element() and not is_ios: if not is_ios and full_screen_supported():
text = _('Exit full screen') if full_screen_element() else _('Enter full screen')
# No fullscreen on iOS, see http://caniuse.com/#search=fullscreen # No fullscreen on iOS, see http://caniuse.com/#search=fullscreen
full_screen_actions.push( full_screen_actions.push(
ac(_('Toggle full screen'), _('Toggle full screen mode'), def(): self.overlay.hide(), ui_operations.toggle_full_screen();, 'full-screen') ac(text, _('Toggle full screen mode'), def(): self.overlay.hide(), ui_operations.toggle_full_screen();, 'full-screen')
) )
if full_screen_actions.length: if full_screen_actions.length:
actions_div.appendChild(E.ul(*full_screen_actions)) actions_div.appendChild(E.ul(*full_screen_actions))

7
src/pyj/utils.pyj
View File

@ -75,6 +75,13 @@ def encode_query_with_path(query, path):
return path + encode_query(query, '#') return path + encode_query(query, '#')
def full_screen_supported(elem):
elem = elem or document.documentElement
if elem.requestFullScreen or elem.webkitRequestFullScreen or elem.mozRequestFullScreen:
return True
return False
def request_full_screen(elem): def request_full_screen(elem):
elem = elem or document.documentElement elem = elem or document.documentElement
options = {'navigationUI': 'hide'} options = {'navigationUI': 'hide'}