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

hints: use getClientRects() JS method to get the correct click position

Browse Source
This commit is contained in:
Jakub Klinkovský 2016-02-15 15:48:56 +01:00
parent ff779ef329
commit a546933516
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qutebrowser/browser/hints.py
View File

@ -26,7 +26,7 @@ import re
import string import string
from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QEvent, Qt, QUrl, from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QEvent, Qt, QUrl,
QTimer) QTimer, QPoint)
from PyQt5.QtGui import QMouseEvent from PyQt5.QtGui import QMouseEvent
from PyQt5.QtWebKit import QWebElement from PyQt5.QtWebKit import QWebElement
from PyQt5.QtWebKitWidgets import QWebPage from PyQt5.QtWebKitWidgets import QWebPage
@ -438,14 +438,31 @@ class HintManager(QObject):
target_mapping[Target.tab] = usertypes.ClickTarget.tab_bg target_mapping[Target.tab] = usertypes.ClickTarget.tab_bg
else: else:
target_mapping[Target.tab] = usertypes.ClickTarget.tab target_mapping[Target.tab] = usertypes.ClickTarget.tab
action = "Hovering" if context.target == Target.hover else "Clicking"
log.hints.debug("{} on element '{}'".format(action, elem.debug_text()))
# FIXME Instead of clicking the center, we could have nicer heuristics. # FIXME Instead of clicking the center, we could have nicer heuristics.
# e.g. parse (-webkit-)border-radius correctly and click text fields at # e.g. parse (-webkit-)border-radius correctly and click text fields at
# the bottom right, and everything else on the top left or so. # the bottom right, and everything else on the top left or so.
# https://github.com/The-Compiler/qutebrowser/issues/70 # https://github.com/The-Compiler/qutebrowser/issues/70
pos = elem.rect_on_view().center() pos = elem.rect_on_view().center()
action = "Hovering" if context.target == Target.hover else "Clicking" log.hints.debug("Center position: {}".format(pos))
log.hints.debug("{} on '{}' at {}/{}".format( boxes = elem.evaluateJavaScript("this.getClientRects()")
action, elem, pos.x(), pos.y())) log.hints.debug("Bounding boxes: {}".format(boxes))
for key in sorted(boxes):
box = boxes[key]
width = box.get("width", 0)
height = box.get("height", 0)
# skip boxes with zero dimensions (happens to <a> if they contain
# other elements with display:block style)
# https://github.com/The-Compiler/qutebrowser/issues/1298
if width > 0 and height > 0:
pos = QPoint(box["left"] + width / 2, box["top"] + height / 2)
log.hints.debug("Updated position: {}".format(pos))
break
log.hints.debug("Final position is {}".format(pos))
self.start_hinting.emit(target_mapping[context.target]) self.start_hinting.emit(target_mapping[context.target])
if context.target in [Target.tab, Target.tab_fg, Target.tab_bg, if context.target in [Target.tab, Target.tab_fg, Target.tab_bg,
Target.window]: Target.window]: