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

Finish up the ToC highlighting implementation for the new viewer

Browse Source
This commit is contained in:
Kovid Goyal 2016-12-30 15:46:43 +05:30
parent d2ccda55cc
commit 40140d4b88
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pyj/read_book/toc.pyj
View File

@ -8,7 +8,7 @@ from elementmaker import E
from gettext import gettext as _ from gettext import gettext as _
from modals import error_dialog from modals import error_dialog
from widgets import create_tree, find_text_in_tree, scroll_tree_item_into_view from widgets import create_tree, find_text_in_tree, scroll_tree_item_into_view
from read_book.globals import toc_anchor_map, set_toc_anchor_map, current_spine_item, current_layout_mode from read_book.globals import toc_anchor_map, set_toc_anchor_map, current_spine_item, current_layout_mode, get_boss
def update_visible_toc_nodes(visible_anchors): def update_visible_toc_nodes(visible_anchors):
@ -47,9 +47,9 @@ def get_highlighted_toc_nodes(toc, spine, parent_map, id_map):
pid = parent_map[pid] pid = parent_map[pid]
return ans return ans
def get_toc_maps(toc):
def create_toc_tree(toc, onclick): if not toc:
toc = get_boss().book.manifest.toc
parent_map, id_map = {}, {} parent_map, id_map = {}, {}
def process_node(node, parent): def process_node(node, parent):
@ -59,6 +59,10 @@ def create_toc_tree(toc, onclick):
process_node(c, node) process_node(c, node)
process_node(toc) process_node(toc)
return parent_map, id_map
def create_toc_tree(toc, onclick):
parent_map, id_map = get_toc_maps(toc)
highlighted_toc_nodes = get_highlighted_toc_nodes(toc, parent_map, id_map) highlighted_toc_nodes = get_highlighted_toc_nodes(toc, parent_map, id_map)
def populate_data(node, li, a): def populate_data(node, li, a):
@ -109,7 +113,8 @@ def current_toc_anchor_map(tam, anchor_funcs):
name = current_spine_item().name name = current_spine_item().name
am = {} am = {}
anchors = v'[]' anchors = v'[]'
for anchor in (tam[name] or v'[]'): pos_map = {}
for i, anchor in enumerate(tam[name] or v'[]'):
val = anchor_funcs.pos_for_elem() val = anchor_funcs.pos_for_elem()
if anchor.frag: if anchor.frag:
elem = document.getElementById(anchor.frag) elem = document.getElementById(anchor.frag)
@ -117,10 +122,11 @@ def current_toc_anchor_map(tam, anchor_funcs):
val = anchor_funcs.pos_for_elem(elem) val = anchor_funcs.pos_for_elem(elem)
am[anchor.id] = val am[anchor.id] = val
anchors.push(anchor.id) anchors.push(anchor.id)
anchors.sort(def (a, b): anchor_funcs.cmp(am[a], am[b]);) pos_map[anchor.id] = i
sort_map = {aid: i for i, aid in enumerate(anchors)} # stable sort by position in document
anchors.sort(def (a, b): return anchor_funcs.cmp(am[a], am[b]) or (pos_map[a] - pos_map[b]);)
current_map = {'layout_mode': current_layout_mode, 'width': window.innerWidth, 'height': window.innerHeight, 'pos_map': am, 'sort_map':sort_map} current_map = {'layout_mode': current_layout_mode, 'width': window.innerWidth, 'height': window.innerHeight, 'pos_map': am, 'sorted_anchors':anchors}
set_toc_anchor_map(current_map) set_toc_anchor_map(current_map)
return current_map return current_map
@ -130,7 +136,8 @@ def update_visible_toc_anchors(toc_anchor_map, anchor_funcs):
before = after = None before = after = None
visible_anchors = {} visible_anchors = {}
has_visible = False has_visible = False
for anchor_id in tam.pos_map:
for anchor_id in tam.sorted_anchors:
pos = tam.pos_map[anchor_id] pos = tam.pos_map[anchor_id]
visibility = anchor_funcs.visibility(pos) visibility = anchor_funcs.visibility(pos)
if visibility < 0: if visibility < 0: