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

Reserve space for empty favicon in _get_icon_rect.

Browse Source
This commit is contained in:
Sebastian Frysztak 2016-10-03 13:14:49 +02:00
parent 4f443c9f27
commit df83862088
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qutebrowser/mainwindow/tabwidget.py
View File

@ -609,11 +609,8 @@ class TabBarStyle(QCommonStyle):
# any sophisticated drawing. # any sophisticated drawing.
super().drawControl(QStyle.CE_TabBarTabShape, opt, p, widget) super().drawControl(QStyle.CE_TabBarTabShape, opt, p, widget)
elif element == QStyle.CE_TabBarTabLabel: elif element == QStyle.CE_TabBarTabLabel:
position = config.get('tabs', 'position')
if not opt.icon.isNull() and layouts.icon.isValid(): if not opt.icon.isNull() and layouts.icon.isValid():
self._draw_icon(layouts, opt, p) self._draw_icon(layouts, opt, p)
elif position in [QTabWidget.West, QTabWidget.East]:
layouts.text.translate(opt.iconSize.width() + 4, 0)
alignment = (config.get('tabs', 'title-alignment') | alignment = (config.get('tabs', 'title-alignment') |
Qt.AlignVCenter | Qt.TextHideMnemonic) Qt.AlignVCenter | Qt.TextHideMnemonic)
self._style.drawItemText(p, layouts.text, alignment, opt.palette, self._style.drawItemText(p, layouts.text, alignment, opt.palette,
@ -706,13 +703,10 @@ class TabBarStyle(QCommonStyle):
text_rect.adjust(indicator_width + indicator_padding.left + text_rect.adjust(indicator_width + indicator_padding.left +
indicator_padding.right, 0, 0, 0) indicator_padding.right, 0, 0, 0)
if opt.icon.isNull(): icon_rect = self._get_icon_rect(opt, text_rect)
icon_rect = QRect() if icon_rect.isValid():
else:
icon_padding = self.pixelMetric(PixelMetrics.icon_padding, opt) icon_padding = self.pixelMetric(PixelMetrics.icon_padding, opt)
icon_rect = self._get_icon_rect(opt, text_rect) text_rect.adjust(icon_rect.width() + icon_padding, 0, 0, 0)
if icon_rect.isValid():
text_rect.adjust(icon_rect.width() + icon_padding, 0, 0, 0)
text_rect = self._style.visualRect(opt.direction, opt.rect, text_rect) text_rect = self._style.visualRect(opt.direction, opt.rect, text_rect)
return Layouts(text=text_rect, icon=icon_rect, return Layouts(text=text_rect, icon=icon_rect,
@ -736,9 +730,17 @@ class TabBarStyle(QCommonStyle):
else QIcon.Disabled) else QIcon.Disabled)
icon_state = (QIcon.On if opt.state & QStyle.State_Selected icon_state = (QIcon.On if opt.state & QStyle.State_Selected
else QIcon.Off) else QIcon.Off)
tab_icon_size = opt.icon.actualSize(icon_size, icon_mode, icon_state) # reserve space for favicon when tab bar is vertical (issue #1968)
tab_icon_size = QSize(min(tab_icon_size.width(), icon_size.width()), position = config.get('tabs', 'position')
min(tab_icon_size.height(), icon_size.height())) show_favicons = config.get('tabs', 'show-favicons')
if (opt.icon.isNull()
and position in [QTabWidget.East, QTabWidget.West]
and show_favicons):
tab_icon_size = icon_size
else:
actual_size = opt.icon.actualSize(icon_size, icon_mode, icon_state)
tab_icon_size = QSize(min(actual_size.width(), icon_size.width()),
min(actual_size.height(), icon_size.height()))
icon_rect = QRect(text_rect.left(), text_rect.top() + 1, icon_rect = QRect(text_rect.left(), text_rect.top() + 1,
tab_icon_size.width(), tab_icon_size.height()) tab_icon_size.width(), tab_icon_size.height())
icon_rect = self._style.visualRect(opt.direction, opt.rect, icon_rect) icon_rect = self._style.visualRect(opt.direction, opt.rect, icon_rect)