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

Handle QWebElements with an invalid geometry correctly

Browse Source
This commit is contained in:
Florian Bruhin 2014-05-12 10:59:30 +02:00
parent 3974c4dd88
commit 0c9074f71b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qutebrowser/utils/webelem.py
View File

@ -85,14 +85,25 @@ def is_visible(elem, mainframe):
return False return False
# First check if the element is visible on screen # First check if the element is visible on screen
elem_rect = rect_on_view(elem) elem_rect = rect_on_view(elem)
visible_on_screen = mainframe.geometry().intersects(elem_rect) if elem_rect.isValid():
visible_on_screen = mainframe.geometry().intersects(elem_rect)
else:
# We got an invalid rectangle (width/height 0/0 probably), but this can
# still be a valid link.
visible_on_screen = mainframe.geometry().contains(elem_rect.topLeft())
# Then check if it's visible in its frame if it's not in the main frame. # Then check if it's visible in its frame if it's not in the main frame.
elem_frame = elem.webFrame() elem_frame = elem.webFrame()
elem_rect = elem.geometry()
if elem_frame.parentFrame() is not None: if elem_frame.parentFrame() is not None:
framegeom = elem_frame.geometry() framegeom = elem_frame.geometry()
framegeom.moveTo(0, 0) framegeom.moveTo(0, 0)
framegeom.translate(elem_frame.scrollPosition()) framegeom.translate(elem_frame.scrollPosition())
visible_in_frame = framegeom.intersects(elem.geometry()) if elem_rect.isValid():
visible_in_frame = framegeom.intersects(elem_rect)
else:
# We got an invalid rectangle (width/height 0/0 probably), but this
# can still be a valid link.
visible_in_frame = framegeom.contains(elem_rect.topLeft())
else: else:
visible_in_frame = visible_on_screen visible_in_frame = visible_on_screen
return all([visible_on_screen, visible_in_frame]) return all([visible_on_screen, visible_in_frame])