From 56ee7d63b37d0994c8c2c38a97e91b2bf91595b2 Mon Sep 17 00:00:00 2001 From: thuck Date: Sun, 13 Nov 2016 09:50:54 +0100 Subject: [PATCH 1/5] Should fix the issue #2117 --- qutebrowser/browser/webengine/webenginetab.py | 1 - qutebrowser/browser/webkit/webkittab.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index acef4e5ef..67c9df258 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -472,7 +472,6 @@ class WebEngineTab(browsertab.AbstractTab): # init js stuff self._init_js() self._child_event_filter = None - self.needs_qtbug54419_workaround = False def _init_js(self): js_code = '\n'.join([ diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index 61de1bd54..aa63968e8 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -607,6 +607,7 @@ class WebKitTab(browsertab.AbstractTab): self._connect_signals() self.zoom.set_default() self.backend = usertypes.Backend.QtWebKit + self.needs_qtbug54419_workaround = False def _install_event_filter(self): self._widget.installEventFilter(self._mouse_event_filter) From 0eab91ac4c46bf425c2af8ffcb55252cb9bb5ec4 Mon Sep 17 00:00:00 2001 From: thuck Date: Sun, 13 Nov 2016 11:56:21 +0100 Subject: [PATCH 2/5] Fix for webengine too --- qutebrowser/browser/browsertab.py | 1 + qutebrowser/browser/webkit/webkittab.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 22f1c7e51..3e5c6e01b 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -560,6 +560,7 @@ class AbstractTab(QWidget): self._mouse_event_filter = mouse.MouseEventFilter( self, widget_class=self.WIDGET_CLASS, parent=self) self.backend = None + self.needs_qtbug54419_workaround = False # FIXME:qtwebengine Should this be public api via self.hints? # Also, should we get it out of objreg? diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index aa63968e8..61de1bd54 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -607,7 +607,6 @@ class WebKitTab(browsertab.AbstractTab): self._connect_signals() self.zoom.set_default() self.backend = usertypes.Backend.QtWebKit - self.needs_qtbug54419_workaround = False def _install_event_filter(self): self._widget.installEventFilter(self._mouse_event_filter) From e1012501ec826618fc1cfcc91e3e6a83b6189cf6 Mon Sep 17 00:00:00 2001 From: thuck Date: Sun, 13 Nov 2016 12:10:03 +0100 Subject: [PATCH 3/5] Issue only happens when using webengine Check if using webengine, before trying to use thw workaround --- qutebrowser/browser/browsertab.py | 1 - qutebrowser/browser/webengine/webenginetab.py | 1 + qutebrowser/mainwindow/tabbedbrowser.py | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 3e5c6e01b..22f1c7e51 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -560,7 +560,6 @@ class AbstractTab(QWidget): self._mouse_event_filter = mouse.MouseEventFilter( self, widget_class=self.WIDGET_CLASS, parent=self) self.backend = None - self.needs_qtbug54419_workaround = False # FIXME:qtwebengine Should this be public api via self.hints? # Also, should we get it out of objreg? diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 67c9df258..acef4e5ef 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -472,6 +472,7 @@ class WebEngineTab(browsertab.AbstractTab): # init js stuff self._init_js() self._child_event_filter = None + self.needs_qtbug54419_workaround = False def _init_js(self): js_code = '\n'.join([ diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index 7dfd9b8fd..915e927c7 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -521,7 +521,8 @@ class TabbedBrowser(tabwidget.TabWidget): # If needed, re-open the tab as a workaround for QTBUG-54419. # See https://bugreports.qt.io/browse/QTBUG-54419 - if tab.needs_qtbug54419_workaround: + if (tab.backend == usertypes.Backend.QtWebEngine and + tab.needs_qtbug54419_workaround): log.misc.debug("Doing QTBUG-54419 workaround for {}, " "url {}".format(tab, url)) self.setUpdatesEnabled(False) From 02257694c4ed87f6e1cb0ecad50e578123ea4d4e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 13 Nov 2016 12:43:20 +0100 Subject: [PATCH 4/5] Fix indent --- qutebrowser/mainwindow/tabbedbrowser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index 915e927c7..e38610ad2 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -522,7 +522,7 @@ class TabbedBrowser(tabwidget.TabWidget): # If needed, re-open the tab as a workaround for QTBUG-54419. # See https://bugreports.qt.io/browse/QTBUG-54419 if (tab.backend == usertypes.Backend.QtWebEngine and - tab.needs_qtbug54419_workaround): + tab.needs_qtbug54419_workaround): log.misc.debug("Doing QTBUG-54419 workaround for {}, " "url {}".format(tab, url)) self.setUpdatesEnabled(False) From 9d6e87848a3e546562c31c528bb3625df682fdce Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 13 Nov 2016 12:43:31 +0100 Subject: [PATCH 5/5] Regenerate authors --- README.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.asciidoc b/README.asciidoc index a253ea6fb..28614d3ae 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -208,6 +208,7 @@ Contributors, sorted by the number of commits in descending order: * Jussi Timperi * Fritz Reichwald * Brian Jackson +* thuck * sbinix * neeasade * jnphilipp