From 6d61b4339c6181ba0fb37e517250cf5fe6f5cb54 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Mon, 15 Apr 2013 19:52:12 +0000
Subject: Palette: restructure the checks for link, image, selection - SL #4262

This is part of making the palette handle images which are also links.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
diff --git a/palettes.py b/palettes.py
index 3571ae0..5f63a06 100644
--- a/palettes.py
+++ b/palettes.py
@@ -117,7 +117,13 @@ class ContentInvoker(Invoker):
 
     def _handle_event(self, event):
         hit_test = self._browser.get_hit_test_result(event)
-        if hit_test.props.context & WebKit.HitTestResultContext.LINK:
+        hit_context = hit_test.props.context
+        hit_info = {
+            'is link': hit_context & WebKit.HitTestResultContext.LINK,
+            'is image': hit_context & WebKit.HitTestResultContext.IMAGE,
+            'is selection': hit_context & WebKit.HitTestResultContext.SELECTION,
+            }
+        if hit_info['is link']:
             link_uri = hit_test.props.link_uri
             if isinstance(hit_test.props.inner_node,
                             WebKit.DOMHTMLImageElement):
@@ -126,12 +132,12 @@ class ContentInvoker(Invoker):
                 title = hit_test.props.inner_node.get_text_content()
             self.palette = LinkPalette(self._browser, title, link_uri)
             self.notify_right_click()
-        elif hit_test.props.context & WebKit.HitTestResultContext.IMAGE:
+        elif hit_info['is image']:
             title = hit_test.props.inner_node.get_title()
             self.palette = ImagePalette(self._browser, title,
                                         hit_test.props.image_uri)
             self.notify_right_click()
-        elif hit_test.props.context & WebKit.HitTestResultContext.SELECTION:
+        elif hit_info['is selection']:
             # TODO: find a way to get the selected text so we can use
             # it as the title of the Palette.
             # The function webkit_web_view_get_selected_text was removed
--
cgit v0.9.1