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

Viewer: When starting without a book allowing quitting the viewer by clicking the close button on the "Open book" page

Browse Source 
Fixes #1864343 [Can't close window when E-book viewer is opened in full screen mode](https://bugs.launchpad.net/calibre/+bug/1864343)
This commit is contained in:
Kovid Goyal 2020-02-29 11:48:25 +05:30
parent eddc3254bd
commit a533694b65
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,20 +481,30 @@ class OpenBook: # {{{
def __init__(self, overlay, closeable): def __init__(self, overlay, closeable):
self.overlay = overlay self.overlay = overlay
self.closeable = closeable self.closeable = closeable
self.is_not_escapable = not closeable # prevent Esc key from closing
def handle_escape(self):
if self.closeable:
self.overlay.hide_current_panel()
else:
ui_operations.quit()
def on_container_click(self, evt): def on_container_click(self, evt):
pass # Dont allow panel to be closed by a click pass # Dont allow panel to be closed by a click
def show(self, container): def show(self, container):
container.style.backgroundColor = get_color('window-background') container.style.backgroundColor = get_color('window-background')
close_button_style = '' if self.closeable else 'display: none'
container.appendChild(E.div( container.appendChild(E.div(
style='padding: 1ex 1em; border-bottom: solid 1px currentColor; display:flex; justify-content: space-between', style='padding: 1ex 1em; border-bottom: solid 1px currentColor; display:flex; justify-content: space-between',
E.h2(_('Open a new book')), E.h2(_('Open a new book')),
E.div( E.div(
svgicon('close'), style=f'cursor:pointer; {close_button_style}', svgicon('close'), style=f'cursor:pointer',
onclick=def(event):event.preventDefault(), event.stopPropagation(), self.overlay.hide_current_panel(event);, onclick=def(event):
event.preventDefault(), event.stopPropagation()
if self.closeable:
self.overlay.hide_current_panel(event)
else:
ui_operations.quit()
,
class_='simple-link'), class_='simple-link'),
)) ))
create_open_book(container, self.overlay.view?.book) create_open_book(container, self.overlay.view?.book)