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

CompletionView:

Browse Source 
- column_widths -> _column_widths
- removed if-statement to verify if source model has 'column_widths'-property
This commit is contained in:
Alexander Cogneau 2015-08-08 17:47:18 +02:00
parent 36372418ca
commit 0e9f268817
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.asciidoc
View File

@ -48,6 +48,8 @@ Changed
mode and is not hidden anymore. mode and is not hidden anymore.
- `minimal_webkit_testbrowser.py` now has a `--webengine` switch to test - `minimal_webkit_testbrowser.py` now has a `--webengine` switch to test
QtWebEngine if it's installed. QtWebEngine if it's installed.
- The column width percentages for the completion view now depend on the
completion model.
Fixed Fixed
~~~~~ ~~~~~

10
qutebrowser/completion/completionwidget.py
View File

@ -45,7 +45,7 @@ class CompletionView(QTreeView):
_height: The height to use for the CompletionView. _height: The height to use for the CompletionView.
_height_perc: Either None or a percentage if height should be relative. _height_perc: Either None or a percentage if height should be relative.
_delegate: The item delegate used. _delegate: The item delegate used.
column_widths: A list of column widths, in percent. _column_widths: A list of column widths, in percent.
Signals: Signals:
resize_completion: Emitted when the completion should be resized. resize_completion: Emitted when the completion should be resized.
@ -101,7 +101,7 @@ class CompletionView(QTreeView):
# FIXME handle new aliases. # FIXME handle new aliases.
# objreg.get('config').changed.connect(self.init_command_completion) # objreg.get('config').changed.connect(self.init_command_completion)
self.column_widths = BaseCompletionModel.COLUMN_WIDTHS self._column_widths = BaseCompletionModel.COLUMN_WIDTHS
self._delegate = completiondelegate.CompletionItemDelegate(self) self._delegate = completiondelegate.CompletionItemDelegate(self)
self.setItemDelegate(self._delegate) self.setItemDelegate(self._delegate)
@ -130,7 +130,7 @@ class CompletionView(QTreeView):
def _resize_columns(self): def _resize_columns(self):
"""Resize the completion columns based on column_widths.""" """Resize the completion columns based on column_widths."""
width = self.size().width() width = self.size().width()
pixel_widths = [(width * perc // 100) for perc in self.column_widths] pixel_widths = [(width * perc // 100) for perc in self._column_widths]
if self.verticalScrollBar().isVisible(): if self.verticalScrollBar().isVisible():
pixel_widths[-1] -= self.style().pixelMetric( pixel_widths[-1] -= self.style().pixelMetric(
QStyle.PM_ScrollBarExtent) + 5 QStyle.PM_ScrollBarExtent) + 5
@ -204,9 +204,7 @@ class CompletionView(QTreeView):
for i in range(model.rowCount()): for i in range(model.rowCount()):
self.expand(model.index(i, 0)) self.expand(model.index(i, 0))
if model.column_widths: self._column_widths = model.source.COLUMN_WIDTHS
self.column_widths = model.column_widths
self._resize_columns() self._resize_columns()
self.maybe_resize_completion() self.maybe_resize_completion()

3
qutebrowser/completion/models/sortfilter.py
View File

@ -39,8 +39,6 @@ class CompletionFilterModel(QSortFilterProxyModel):
Kept as attribute because calling `sourceModel` takes quite Kept as attribute because calling `sourceModel` takes quite
a long time for some reason. a long time for some reason.
_sort_order: The order to use for sorting if using dumb_sort. _sort_order: The order to use for sorting if using dumb_sort.
column_widths: the width percentages of the columns in the
completion view.
""" """
def __init__(self, source, parent=None, *, dumb_sort=None): def __init__(self, source, parent=None, *, dumb_sort=None):
@ -55,7 +53,6 @@ class CompletionFilterModel(QSortFilterProxyModel):
else: else:
self.setSortRole(completion.Role.sort) self.setSortRole(completion.Role.sort)
self._sort_order = dumb_sort self._sort_order = dumb_sort
self.column_widths = source.COLUMN_WIDTHS
def set_pattern(self, val): def set_pattern(self, val):
"""Setter for pattern. """Setter for pattern.