From 06c8f2d03a8c481800f21505fee91dcddae2957f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 30 Jan 2014 22:29:01 +0100
Subject: [PATCH] Set sensible sizePolicies everywhere

---
 qutebrowser/widgets/browser.py           | 3 ++-
 qutebrowser/widgets/completion.py        | 3 ++-
 qutebrowser/widgets/statusbar/command.py | 3 ++-
 qutebrowser/widgets/statusbar/text.py    | 2 +-
 qutebrowser/widgets/tabbar.py            | 4 +++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/widgets/browser.py b/qutebrowser/widgets/browser.py
index a66cf6779..1b0fd3bcf 100644
--- a/qutebrowser/widgets/browser.py
+++ b/qutebrowser/widgets/browser.py
@@ -7,7 +7,7 @@ containing BrowserTabs).
 
 import logging
 
-from PyQt5.QtWidgets import QShortcut, QApplication
+from PyQt5.QtWidgets import QShortcut, QApplication, QSizePolicy
 from PyQt5.QtCore import pyqtSignal, Qt, QEvent
 from PyQt5.QtGui import QClipboard
 from PyQt5.QtPrintSupport import QPrintPreviewDialog
@@ -43,6 +43,7 @@ class TabbedBrowser(TabWidget):
         space.setKey(Qt.Key_Space)
         space.setContext(Qt.WidgetWithChildrenShortcut)
         space.activated.connect(self.space_scroll)
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
     def tabopen(self, url):
         """Open a new tab with a given url.
diff --git a/qutebrowser/widgets/completion.py b/qutebrowser/widgets/completion.py
index d76949be5..4530132c2 100644
--- a/qutebrowser/widgets/completion.py
+++ b/qutebrowser/widgets/completion.py
@@ -8,7 +8,7 @@ subclasses to provide completions.
 import html
 
 from PyQt5.QtWidgets import (QTreeView, QStyledItemDelegate, QStyle,
-                             QStyleOptionViewItem)
+                             QStyleOptionViewItem, QSizePolicy)
 from PyQt5.QtCore import (QRectF, QRect, QPoint, pyqtSignal, Qt,
                           QItemSelectionModel)
 from PyQt5.QtGui import (QIcon, QPalette, QTextDocument, QTextOption,
@@ -77,6 +77,7 @@ class CompletionView(QTreeView):
         self.model.pattern_changed.connect(self.resort)
         self.setItemDelegate(CompletionItemDelegate())
         self.setStyleSheet(config.get_stylesheet(self._stylesheet))
+        self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Minimum)
         self.expandAll()
         self.setHeaderHidden(True)
         self.setIndentation(0)
diff --git a/qutebrowser/widgets/statusbar/command.py b/qutebrowser/widgets/statusbar/command.py
index 017876a32..1e8321337 100644
--- a/qutebrowser/widgets/statusbar/command.py
+++ b/qutebrowser/widgets/statusbar/command.py
@@ -1,7 +1,7 @@
 """The commandline part of the statusbar."""
 import logging
 
-from PyQt5.QtWidgets import QLineEdit, QShortcut
+from PyQt5.QtWidgets import QLineEdit, QShortcut, QSizePolicy
 from PyQt5.QtCore import pyqtSignal, Qt
 from PyQt5.QtGui import QValidator, QKeySequence
 
@@ -35,6 +35,7 @@ class Command(QLineEdit):
         self.setValidator(Validator())
         self.returnPressed.connect(self.process_cmdline)
         self.textEdited.connect(self._histbrowse_stop)
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)
 
         for (key, handler) in [
                 (Qt.Key_Escape, self.esc_pressed),
diff --git a/qutebrowser/widgets/statusbar/text.py b/qutebrowser/widgets/statusbar/text.py
index c698ff999..40c1cb245 100644
--- a/qutebrowser/widgets/statusbar/text.py
+++ b/qutebrowser/widgets/statusbar/text.py
@@ -19,7 +19,7 @@ class Text(QLabel):
     def __init__(self, bar):
         super().__init__(bar)
         self.setStyleSheet("padding-right: 1px;")
-        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Ignored)
+        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Minimum)
 
     def __setattr__(self, name, value):
         super().__setattr__(name, value)
diff --git a/qutebrowser/widgets/tabbar.py b/qutebrowser/widgets/tabbar.py
index 8c05b1b1d..c8d1d4f50 100644
--- a/qutebrowser/widgets/tabbar.py
+++ b/qutebrowser/widgets/tabbar.py
@@ -1,6 +1,6 @@
 """The tab widget used for TabbedBrowser from browser.py."""
 
-from PyQt5.QtWidgets import QTabWidget
+from PyQt5.QtWidgets import QTabWidget, QSizePolicy
 from PyQt5.QtCore import Qt
 
 import qutebrowser.utils.config as config
@@ -21,6 +21,7 @@ class TabWidget(QTabWidget):
         QTabBar {{
             font-family: {monospace};
             font-size: 8pt;
+            height: 13px;
         }}
 
         QTabBar::tab {{
@@ -43,6 +44,7 @@ class TabWidget(QTabWidget):
 
     def __init__(self, parent):
         super().__init__(parent)
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
         self.setStyleSheet(config.get_stylesheet(self._stylesheet))
         self.setDocumentMode(True)
         self.setElideMode(Qt.ElideRight)