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

Merge branch 'master' of https://github.com/qutebrowser/qutebrowser into jay/tab-bg-focus

Browse Source
This commit is contained in:
Jay Kamat 2018-05-26 13:52:12 -07:00
commit 3392d82f50
No known key found for this signature in database
GPG Key ID: 5D2E399600F4F7B5
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/changelog.asciidoc
View File

@ -50,7 +50,7 @@ Fixed
~~~~~ ~~~~~
- Work around an issue in Qt 5.11 where e.g. activating JavaScript per-domain - Work around an issue in Qt 5.11 where e.g. activating JavaScript per-domain
needed a manual relaod in some cases. needed a manual reload in some cases.
- Don't crash when a ² key is pressed (e.g. on AZERTY keyboards). - Don't crash when a ² key is pressed (e.g. on AZERTY keyboards).
v1.3.0 v1.3.0

3
qutebrowser/browser/mouse.py
View File

@ -58,6 +58,9 @@ class ChildEventFilter(QObject):
if qtutils.version_check('5.11', compiled=False, exact=True): if qtutils.version_check('5.11', compiled=False, exact=True):
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68076 # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68076
QTimer.singleShot(0, self._widget.setFocus) QTimer.singleShot(0, self._widget.setFocus)
elif event.type() == QEvent.ChildRemoved:
child = event.child()
log.mouse.debug("{}: removed child {}".format(obj, child))
return False return False

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

@ -30,7 +30,7 @@ from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
QUrl, QTimer) QUrl, QTimer)
from PyQt5.QtGui import QKeyEvent, QIcon from PyQt5.QtGui import QKeyEvent, QIcon
from PyQt5.QtNetwork import QAuthenticator from PyQt5.QtNetwork import QAuthenticator
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication, QWidget
from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript
from qutebrowser.config import configdata, config from qutebrowser.config import configdata, config
@ -1035,8 +1035,9 @@ class WebEngineTab(browsertab.AbstractTab):
log.config.debug( log.config.debug(
"Loading {} again because of config change".format( "Loading {} again because of config change".format(
self._reload_url.toDisplayString())) self._reload_url.toDisplayString()))
QTimer.singleShot(100, lambda url=self._reload_url: QTimer.singleShot(100, functools.partial(self.openurl,
self.openurl(url, predict=False)) self._reload_url,
predict=False))
self._reload_url = None self._reload_url = None
if not qtutils.version_check('5.10', compiled=False): if not qtutils.version_check('5.10', compiled=False):
@ -1060,7 +1061,14 @@ class WebEngineTab(browsertab.AbstractTab):
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68224 # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68224
layout = self._widget.layout() layout = self._widget.layout()
count = layout.count() count = layout.count()
children = self._widget.findChildren(QWidget)
if not count and children:
log.webview.warning("Found children not in layout: {}, "
"focus proxy {} (QTBUG-68224)".format(
children, self._widget.focusProxy()))
if count > 1: if count > 1:
log.webview.debug("Found {} widgets! (QTBUG-68224)"
.format(count))
for i in range(count): for i in range(count):
item = layout.itemAt(i) item = layout.itemAt(i)
if item is None: if item is None: