From 21753bc65f6817400454bd0ca504c734c4c2981a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 14 Jun 2016 18:25:07 +0200 Subject: [PATCH] Make AbstractCaret a QObject --- qutebrowser/browser/tab.py | 11 ++++++----- qutebrowser/browser/webengine/webenginetab.py | 2 +- qutebrowser/browser/webkit/webkittab.py | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/qutebrowser/browser/tab.py b/qutebrowser/browser/tab.py index 24e8109d8..33d6bf8af 100644 --- a/qutebrowser/browser/tab.py +++ b/qutebrowser/browser/tab.py @@ -55,11 +55,12 @@ class WrapperLayout(QLayout): self._widget.setGeometry(r) -class AbstractCaret: +class AbstractCaret(QObject): """Attribute of AbstractTab for caret browsing.""" - def __init__(self, win_id, tab): + def __init__(self, win_id, tab, parent=None): + super().__init__(parent) self._tab = tab self._win_id = win_id self.widget = None @@ -258,9 +259,9 @@ class AbstractTab(QWidget): self.win_id = win_id self.tab_id = next(tab_id_gen) super().__init__(parent) - self.history = AbstractHistory(self) - self.scroll = AbstractScroller(parent=self) - self.caret = AbstractCaret(win_id=win_id, tab=self) + # self.history = AbstractHistory(self) + # self.scroll = AbstractScroller(parent=self) + # self.caret = AbstractCaret(win_id=win_id, tab=self, parent=self) self._layout = None self._widget = None self.keep_icon = False # FIXME:refactor get rid of this? diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 1d07058ea..71f3de2f7 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -83,7 +83,7 @@ class WebEngineViewTab(tab.AbstractTab): widget = QWebEngineView() self.history = WebEngineHistory(self) self.scroll = WebEngineScroller() - self.caret = WebEngineCaret(win_id=win_id, tab=self) + self.caret = WebEngineCaret(win_id=win_id, tab=self, parent=self) self._set_widget(widget) self._connect_signals() diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index 269195ffd..bac2a2cfa 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -352,7 +352,7 @@ class WebViewTab(tab.AbstractTab): widget = webview.WebView(win_id, self.tab_id) self.history = WebViewHistory(self) self.scroll = WebViewScroller(parent=self) - self.caret = WebViewCaret(win_id=win_id, tab=self) + self.caret = WebViewCaret(win_id=win_id, tab=self, parent=self) self._set_widget(widget) self._connect_signals()