diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index b8e347a63..f659a7a7e 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -409,10 +409,6 @@ DATA = OrderedDict([ SettingValue(types.Bool(), 'false'), "Whether tabs should have close-buttons."), - ('scroll-buttons', - SettingValue(types.Bool(), 'true'), - "Whether there should be scroll buttons if there are too many tabs."), - ('position', SettingValue(types.Position(), 'north'), "The position of the tab bar."), @@ -429,22 +425,9 @@ DATA = OrderedDict([ SettingValue(types.Bool(), 'true'), "Whether to wrap when changing tabs."), - ('min-tab-width', - SettingValue(types.Int(minval=1), '100'), - "The minimum width of a tab."), - - ('max-tab-width', - SettingValue(types.Int(minval=1), '200'), - "The maximum width of a tab."), - ('show-favicons', SettingValue(types.Bool(), 'true'), "Whether to show favicons in the tab bar."), - - ('expand', - SettingValue(types.Bool(), 'false'), - "Whether to expand tabs to use the full window width."), - )), ('storage', sect.KeyValue( diff --git a/qutebrowser/widgets/tabwidget.py b/qutebrowser/widgets/tabwidget.py index 8f83626a5..0c5540c6f 100644 --- a/qutebrowser/widgets/tabwidget.py +++ b/qutebrowser/widgets/tabwidget.py @@ -72,8 +72,6 @@ class TabWidget(QTabWidget): {color[tab.bg]} {color[tab.fg]} border-right: 2px solid {color[tab.seperator]}; - min-width: {config[tabbar][min-tab-width]}px; - max-width: {config[tabbar][max-tab-width]}px; margin: 0px; }} @@ -108,7 +106,6 @@ class TabWidget(QTabWidget): } self.setMovable(config.get('tabbar', 'movable')) self.setTabsClosable(config.get('tabbar', 'close-buttons')) - self.setUsesScrollButtons(config.get('tabbar', 'scroll-buttons')) posstr = config.get('tabbar', 'position') selstr = config.get('tabbar', 'select-on-remove') self.setTabPosition(position_conv[posstr]) @@ -177,11 +174,8 @@ class TabBar(QTabBar): https://wiki.python.org/moin/PyQt/Customising%20tab%20bars """ - if config.get('tabbar', 'expand'): - height = super().tabSizeHint(index).height() - size = QSize(self.width() / self.count(), height) - else: - size = super().tabSizeHint(index) + height = super().tabSizeHint(index).height() + size = QSize(self.width() / self.count(), height) qt_ensure_valid(size) return size