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

Use block and inline rather than X and Y for anchor_funcs in flow mode

Browse Source
This commit is contained in:
Kovid Goyal 2020-08-13 22:32:40 +05:30
parent 9a9f35ae43
commit 3818b5e1c4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pyj/read_book/flow_mode.pyj
View File

@ -556,16 +556,17 @@ def handle_gesture(gesture):
anchor_funcs = {
'pos_for_elem': def pos_for_elem(elem):
if not elem:
return 0, 0
return {'block': 0, 'inline': 0}
br = elem.getBoundingClientRect()
# Start of object in the scrolling direction
return scroll_viewport.viewport_to_document_block(
scroll_viewport.rect_block_start(br), elem.ownerDocument), scroll_viewport.viewport_to_document_inline(scroll_viewport.rect_inline_start(br))
return {
'block': scroll_viewport.viewport_to_document_block(scroll_viewport.rect_block_start(br), elem.ownerDocument),
'inline': scroll_viewport.viewport_to_document_inline(scroll_viewport.rect_inline_start(br), elem.ownerDocument)
}
,
'visibility': def visibility(pos):
y, x = pos
q = y if scroll_viewport.horizontal_writing_mode else x
q = pos.block
# Have to negate X if in RTL for the math to be correct,
# as the value that the scroll viewport returns is negated
if scroll_viewport.vertical_writing_mode and scroll_viewport.rtl:
@ -578,7 +579,7 @@ anchor_funcs = {
return 1
,
'cmp': def cmp(a, b):
return (a[0] - b[0]) or (a[1] - b[1])
return (a.block - b.block) or (a.inline - b.inline)
,
}