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

E-book viewer: Move read aloud popup bar to the bottom of the screen in flow mode. Fixes #1911470 [Read Aloud toolbar covers text](https://bugs.launchpad.net/calibre/+bug/1911470)

Browse Source
This commit is contained in:
Kovid Goyal 2021-01-19 19:33:36 +05:30
parent 09ccbafe13
commit 991e61af32
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pyj/read_book/read_aloud.pyj
View File

@ -4,6 +4,7 @@ from __python__ import bound_methods, hash_literals
from elementmaker import E from elementmaker import E
from book_list.globals import get_session_data
from book_list.theme import get_color from book_list.theme import get_color
from dom import clear, svgicon, unique_id from dom import clear, svgicon, unique_id
from gettext import gettext as _ from gettext import gettext as _
@ -19,6 +20,12 @@ PLAYING = 3
STOPPED = 4 STOPPED = 4
def is_flow_mode():
sd = get_session_data()
mode = sd.get('read_mode')
return mode is 'flow'
class ReadAloud: class ReadAloud:
dont_hide_on_content_loaded = True dont_hide_on_content_loaded = True
@ -30,11 +37,12 @@ class ReadAloud:
container = self.container container = self.container
container.setAttribute('tabindex', '0') container.setAttribute('tabindex', '0')
container.style.overflow = 'hidden' container.style.overflow = 'hidden'
container.style.textAlign = 'right' container.style.justifyContent = 'flex-end'
container.style.alignItems = 'flex-end' if is_flow_mode() else 'flex-start'
container.appendChild(E.div( container.appendChild(E.div(
id=self.bar_id, id=self.bar_id,
style='position: static; border: solid 1px currentColor; border-radius: 5px;' style='border: solid 1px currentColor; border-radius: 5px;'
'display: inline-flex; flex-direction: column; margin: 1rem;' 'display: flex; flex-direction: column; margin: 1rem;'
)) ))
container.addEventListener('keydown', self.on_keydown, {'passive': False}) container.addEventListener('keydown', self.on_keydown, {'passive': False})
container.addEventListener('click', self.container_clicked, {'passive': False}) container.addEventListener('click', self.container_clicked, {'passive': False})
@ -76,7 +84,7 @@ class ReadAloud:
def show(self): def show(self):
if self.state is HIDDEN: if self.state is HIDDEN:
self.container.style.display = 'block' self.container.style.display = 'flex'
self.state = STOPPED self.state = STOPPED
self.focus() self.focus()
if ui_operations.read_aloud_state_changed: if ui_operations.read_aloud_state_changed:
@ -88,6 +96,7 @@ class ReadAloud:
def build_bar(self, annot_id): def build_bar(self, annot_id):
if self.state is HIDDEN: if self.state is HIDDEN:
return return
self.container.style.alignItems = 'flex-end' if is_flow_mode() else 'flex-start'
bar_container = self.bar bar_container = self.bar
clear(bar_container) clear(bar_container)
bar_container.style.maxWidth = 'min(40rem, 80vw)' if self.supports_css_min_max else '40rem' bar_container.style.maxWidth = 'min(40rem, 80vw)' if self.supports_css_min_max else '40rem'