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

Fix problem with expansions by blocking signals during a recount operation. The 'expand' signal was messing up repainting.

Browse Source
This commit is contained in:
Charles Haley 2012-07-04 09:30:01 +02:00
parent 7dfa9897d9
commit 0145299168
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/gui2/tag_browser/view.py
View File

@ -196,7 +196,7 @@ class TagsView(QTreeView): # {{{
self.made_connections = True self.made_connections = True
self.refresh_signal_processed = True self.refresh_signal_processed = True
db.add_listener(self.database_changed) db.add_listener(self.database_changed)
self.expanded.connect(self.item_expanded) self.expanded.connect(self.item_expanded, type=Qt.QueuedConnection)
def database_changed(self, event, ids): def database_changed(self, event, ids):
if self.refresh_signal_processed: if self.refresh_signal_processed:
@ -649,11 +649,13 @@ class TagsView(QTreeView): # {{{
path = self.model().path_for_index(ci) if self.is_visible(ci) else None path = self.model().path_for_index(ci) if self.is_visible(ci) else None
expanded_categories, state_map = self.get_state() expanded_categories, state_map = self.get_state()
self._model.rebuild_node_tree(state_map=state_map) self._model.rebuild_node_tree(state_map=state_map)
self.blockSignals(True)
for category in expanded_categories: for category in expanded_categories:
idx = self._model.index_for_category(category) idx = self._model.index_for_category(category)
if idx is not None and idx.isValid(): if idx is not None and idx.isValid():
self.expand(idx) self.expand(idx)
self.show_item_at_path(path) self.show_item_at_path(path)
self.blockSignals(False)
def show_item_at_path(self, path, box=False, def show_item_at_path(self, path, box=False,
position=QTreeView.PositionAtCenter): position=QTreeView.PositionAtCenter):
@ -666,14 +668,14 @@ class TagsView(QTreeView): # {{{
self.show_item_at_index(self._model.index_for_path(path), box=box, self.show_item_at_index(self._model.index_for_path(path), box=box,
position=position) position=position)
def expand_parent(self, idx, depth=0): def expand_parent(self, idx):
# Needed otherwise Qt sometimes segfaults if the node is buried in a
# collapsed, off screen hierarchy. To be safe, we expand from the
# outermost in
p = self._model.parent(idx) p = self._model.parent(idx)
d = 0
if p.isValid(): if p.isValid():
d = self.expand_parent(p, depth+1) self.expand_parent(p)
if d == 0: self.expand(idx)
self.expand(idx)
return d+1
def show_item_at_index(self, idx, box=False, def show_item_at_index(self, idx, box=False,
position=QTreeView.PositionAtCenter): position=QTreeView.PositionAtCenter):