rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure HistoryCategory works in isolation.

Browse Source 
While QSortFilterProxyModel emits layoutChanged when changing the
pattern, QSqlQueryModel emits modelReset. As only layoutChanged was
connected, a HistoryCategory would only work in a model that also had at
least one ListCategory.

The simplest solution is to have the parent model emit the signal
directly. This also emits a single signal on a pattern change rather
that one for each child model.

Resolves #3016.
This commit is contained in:
Ryan Roden-Corrent 2017-09-26 22:26:28 -04:00
parent 3a012ca1e3
commit 40e4e73e36
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qutebrowser/completion/models/completionmodel.py
View File

@ -60,8 +60,6 @@ class CompletionModel(QAbstractItemModel):
def add_category(self, cat): def add_category(self, cat):
"""Add a completion category to the model.""" """Add a completion category to the model."""
self._categories.append(cat) self._categories.append(cat)
cat.layoutAboutToBeChanged.connect(self.layoutAboutToBeChanged)
cat.layoutChanged.connect(self.layoutChanged)
def data(self, index, role=Qt.DisplayRole): def data(self, index, role=Qt.DisplayRole):
"""Return the item data for index. """Return the item data for index.
@ -179,8 +177,12 @@ class CompletionModel(QAbstractItemModel):
pattern: The filter pattern to set. pattern: The filter pattern to set.
""" """
log.completion.debug("Setting completion pattern '{}'".format(pattern)) log.completion.debug("Setting completion pattern '{}'".format(pattern))
# layoutChanged is broken in pyqt-5.7.1, so we must use metaObject
# https://www.riverbankcomputing.com/pipermail/pyqt/2017-January/038483.html
self.metaObject().invokeMethod(self, "layoutAboutToBeChanged")
for cat in self._categories: for cat in self._categories:
cat.set_pattern(pattern) cat.set_pattern(pattern)
self.metaObject().invokeMethod(self, "layoutChanged")
def first_item(self): def first_item(self):
"""Return the index of the first child (non-category) in the model.""" """Return the index of the first child (non-category) in the model."""

12
tests/unit/completion/test_completionmodel.py
View File

@ -68,17 +68,17 @@ def test_count(counts):
assert model.count() == sum(counts) assert model.count() == sum(counts)
@hypothesis.given(strategies.text()) @hypothesis.given(pat=strategies.text())
def test_set_pattern(pat): def test_set_pattern(pat, qtbot):
"""Validate the filtering and sorting results of set_pattern.""" """Validate the filtering and sorting results of set_pattern."""
model = completionmodel.CompletionModel() model = completionmodel.CompletionModel()
cats = [mock.Mock(spec=['set_pattern', 'layoutChanged', cats = [mock.Mock(spec=['set_pattern']) for _ in range(3)]
'layoutAboutToBeChanged'])
for _ in range(3)]
for c in cats: for c in cats:
c.set_pattern = mock.Mock(spec=[]) c.set_pattern = mock.Mock(spec=[])
model.add_category(c) model.add_category(c)
model.set_pattern(pat) with qtbot.waitSignals([model.layoutAboutToBeChanged, model.layoutChanged],
order='strict'):
model.set_pattern(pat)
for c in cats: for c in cats:
c.set_pattern.assert_called_with(pat) c.set_pattern.assert_called_with(pat)