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

Set favicon size to tabbar size.

Browse Source 
Fixes #119. Also see #754
This commit is contained in:
Martin Tournoij 2015-06-28 00:03:53 +02:00
parent f31f254d9b
commit 63dae3a885
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/browser/network/qutescheme.py
View File

@ -153,7 +153,7 @@ def qute_help(win_id, request):
"""Handler for qute:help. Return HTML content as bytes.""" """Handler for qute:help. Return HTML content as bytes."""
try: try:
utils.read_file('html/doc/index.html') utils.read_file('html/doc/index.html')
except FileNotFoundError: except (FileNotFoundError, NotADirectoryError, OSError, BlockingIOError):
html = jinja.env.get_template('error.html').render( html = jinja.env.get_template('error.html').render(
title="Error while loading documentation", title="Error while loading documentation",
url=request.url().toDisplayString(), url=request.url().toDisplayString(),

3
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -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

@ -24,7 +24,7 @@ Module attributes:
between items. between items.
""" """
import functools import functools, 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,
@ -296,6 +296,12 @@ 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):
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."""