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

Make AbstractCaret a QObject

Browse Source
This commit is contained in:
Florian Bruhin 2016-06-14 18:25:07 +02:00
parent e21edd3e18
commit 21753bc65f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qutebrowser/browser/tab.py
View File

@ -55,11 +55,12 @@ class WrapperLayout(QLayout):
self._widget.setGeometry(r) self._widget.setGeometry(r)
class AbstractCaret: class AbstractCaret(QObject):
"""Attribute of AbstractTab for caret browsing.""" """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._tab = tab
self._win_id = win_id self._win_id = win_id
self.widget = None self.widget = None
@ -258,9 +259,9 @@ class AbstractTab(QWidget):
self.win_id = win_id self.win_id = win_id
self.tab_id = next(tab_id_gen) self.tab_id = next(tab_id_gen)
super().__init__(parent) super().__init__(parent)
self.history = AbstractHistory(self) # self.history = AbstractHistory(self)
self.scroll = AbstractScroller(parent=self) # self.scroll = AbstractScroller(parent=self)
self.caret = AbstractCaret(win_id=win_id, tab=self) # self.caret = AbstractCaret(win_id=win_id, tab=self, parent=self)
self._layout = None self._layout = None
self._widget = None self._widget = None
self.keep_icon = False # FIXME:refactor get rid of this? self.keep_icon = False # FIXME:refactor get rid of this?

2
qutebrowser/browser/webengine/webenginetab.py
View File

@ -83,7 +83,7 @@ class WebEngineViewTab(tab.AbstractTab):
widget = QWebEngineView() widget = QWebEngineView()
self.history = WebEngineHistory(self) self.history = WebEngineHistory(self)
self.scroll = WebEngineScroller() 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._set_widget(widget)
self._connect_signals() self._connect_signals()

2
qutebrowser/browser/webkit/webkittab.py
View File

@ -352,7 +352,7 @@ class WebViewTab(tab.AbstractTab):
widget = webview.WebView(win_id, self.tab_id) widget = webview.WebView(win_id, self.tab_id)
self.history = WebViewHistory(self) self.history = WebViewHistory(self)
self.scroll = WebViewScroller(parent=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._set_widget(widget)
self._connect_signals() self._connect_signals()