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

Merge branch 'favicon-size' of https://github.com/Carpetsmoker/qutebrowser into tabbar-height

Browse Source
This commit is contained in:
Florian Bruhin 2015-08-01 00:22:17 +02:00
commit 2c716dbf6c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -23,7 +23,7 @@ import functools
import collections import collections
from PyQt5.QtWidgets import QSizePolicy from PyQt5.QtWidgets import QSizePolicy
from PyQt5.QtCore import pyqtSignal, pyqtSlot, QSize, QTimer, QUrl from PyQt5.QtCore import pyqtSignal, pyqtSlot, QTimer, QUrl
from PyQt5.QtGui import QIcon from PyQt5.QtGui import QIcon
from qutebrowser.config import config from qutebrowser.config import config
@ -108,9 +108,6 @@ class TabbedBrowser(tabwidget.TabWidget):
self._undo_stack = [] self._undo_stack = []
self._filter = signalfilter.SignalFilter(win_id, self) self._filter = signalfilter.SignalFilter(win_id, self)
self._now_focused = None self._now_focused = None
# FIXME adjust this to font size
# https://github.com/The-Compiler/qutebrowser/issues/119
self.setIconSize(QSize(12, 12))
objreg.get('config').changed.connect(self.update_favicons) objreg.get('config').changed.connect(self.update_favicons)
objreg.get('config').changed.connect(self.update_window_title) objreg.get('config').changed.connect(self.update_window_title)
objreg.get('config').changed.connect(self.update_tab_titles) objreg.get('config').changed.connect(self.update_tab_titles)

8
qutebrowser/mainwindow/tabwidget.py
View File

@ -21,6 +21,7 @@
import collections import collections
import functools import functools
import math
from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QSize, QRect, QPoint, QTimer from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QSize, QRect, QPoint, QTimer
from PyQt5.QtWidgets import (QTabWidget, QTabBar, QSizePolicy, QCommonStyle, from PyQt5.QtWidgets import (QTabWidget, QTabBar, QSizePolicy, QCommonStyle,
@ -293,6 +294,13 @@ class TabBar(QTabBar):
"""Set the tab bar font.""" """Set the tab bar font."""
self.setFont(config.get('fonts', 'tabbar')) self.setFont(config.get('fonts', 'tabbar'))
def resizeEvent(self, _s):
"""Set the favicon size to the tabbar size minus some padding."""
height = self.size().height()
if height > 0:
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):
"""Set the tab bar colors.""" """Set the tab bar colors."""