From dc7f39514d3eeac1d322989fd7f2dbe988b375c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=A4rehag?= Date: Wed, 9 May 2018 18:28:52 +0200 Subject: [PATCH] pull request #3864, reverted webview changes, fixed regression --- qutebrowser/browser/webengine/webenginetab.py | 4 +++- qutebrowser/browser/webengine/webview.py | 15 +++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 55a349ae8..a9a7c269d 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -768,7 +768,9 @@ class WebEngineTab(browsertab.AbstractTab): scripts.insert(new_script) def _install_event_filter(self): - self._widget.focusProxy().installEventFilter(self._mouse_event_filter) + fp = self._widget.focusProxy() + if fp is not None: + fp.installEventFilter(self._mouse_event_filter) self._child_event_filter = mouse.ChildEventFilter( eventfilter=self._mouse_event_filter, widget=self._widget, parent=self) diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index 8483610d1..70cd11e0d 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -48,7 +48,7 @@ class WebEngineView(QWebEngineView): else: profile = webenginesettings.default_profile page = WebEnginePage(theme_color=theme_color, profile=profile, - parent=self, win_id=win_id) + parent=self) self.setPage(page) def shutdown(self): @@ -130,7 +130,7 @@ class WebEnginePage(QWebEnginePage): shutting_down = pyqtSignal() navigation_request = pyqtSignal(usertypes.NavigationRequest) - def __init__(self, *, theme_color, profile, win_id, parent=None): + def __init__(self, *, theme_color, profile, parent=None): super().__init__(profile, parent) self._is_shutting_down = False self.featurePermissionRequested.connect( @@ -138,7 +138,6 @@ class WebEnginePage(QWebEnginePage): self._theme_color = theme_color self._set_bg_color() config.instance.changed.connect(self._set_bg_color) - self._win_id = win_id self.urlChanged.connect(self._inject_userjs) @config.change_filter('colors.webpage.bg') @@ -311,17 +310,9 @@ class WebEnginePage(QWebEnginePage): QWebEnginePage.NavigationTypeOther: usertypes.NavigationRequest.Type.other, } - accept_request = True - if(url.scheme() == "qute" and url.path() == "print"): - command_dispatcher = objreg.get('command-dispatcher', - scope='window', - window=self._win_id) - command_dispatcher.printpage() - accept_request = False navigation = usertypes.NavigationRequest(url=url, navigation_type=type_map[typ], - is_main_frame=is_main_frame, - accepted=accept_request) + is_main_frame=is_main_frame) self.navigation_request.emit(navigation) return navigation.accepted