Merge branch 'Carpetsmoker-favicon-size-2'
This commit is contained in:
commit
87af685f26
@ -309,13 +309,9 @@ class TabBar(QTabBar):
|
|||||||
def set_font(self):
|
def set_font(self):
|
||||||
"""Set the tab bar font."""
|
"""Set the tab bar font."""
|
||||||
self.setFont(config.get('fonts', 'tabbar'))
|
self.setFont(config.get('fonts', 'tabbar'))
|
||||||
|
size = self.fontMetrics().height() - 2
|
||||||
|
self.setIconSize(QSize(size, size))
|
||||||
|
|
||||||
def resizeEvent(self, e):
|
|
||||||
"""Set the favicon size to the tabbar size minus some padding."""
|
|
||||||
height = e.size().height()
|
|
||||||
if height != 0 and e.oldSize().height() != height:
|
|
||||||
height = math.ceil(height - height / 7)
|
|
||||||
self.setIconSize(QSize(height, height))
|
|
||||||
|
|
||||||
@config.change_filter('colors', 'tabs.bg.bar')
|
@config.change_filter('colors', 'tabs.bg.bar')
|
||||||
def set_colors(self):
|
def set_colors(self):
|
||||||
@ -729,8 +725,7 @@ class TabBarStyle(QCommonStyle):
|
|||||||
tab_icon_size = opt.icon.actualSize(icon_size, icon_mode, icon_state)
|
tab_icon_size = opt.icon.actualSize(icon_size, icon_mode, icon_state)
|
||||||
tab_icon_size = QSize(min(tab_icon_size.width(), icon_size.width()),
|
tab_icon_size = QSize(min(tab_icon_size.width(), icon_size.width()),
|
||||||
min(tab_icon_size.height(), icon_size.height()))
|
min(tab_icon_size.height(), icon_size.height()))
|
||||||
icon_rect = QRect(text_rect.left(),
|
icon_rect = QRect(text_rect.left(), text_rect.top() + 1,
|
||||||
text_rect.center().y() - tab_icon_size.height() / 2,
|
|
||||||
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)
|
||||||
qtutils.ensure_valid(icon_rect)
|
qtutils.ensure_valid(icon_rect)
|
||||||
|
Loading…
Reference in New Issue
Block a user