[EGIT] [core/enlightenment] master 02/02: bugfix: Properly hide/show pointer_image & pointer_object based on if the pointer is located on an existing canvas

[Christopher Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=d0b61e4b88095c80ac82526ebdfdb352f0415c08

commit d0b61e4b88095c80ac82526ebdfdb352f0415c08
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Thu Mar 20 14:15:47 2014 +0000

    bugfix: Properly hide/show pointer_image & pointer_object based on if
    the pointer is located on an existing canvas
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/bin/e_pointer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index e3ea4a9..084e256 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -658,12 +658,12 @@ e_pointer_image_set(E_Pointer *p, E_Pixmap *cp, int w, 
int h, int hot_x, int hot
         evas_object_image_size_set(p->pointer_image, w, h);
         evas_object_image_data_set(p->pointer_image, img);
         evas_object_resize(p->pointer_image, w, h);
-        if (p->e_cursor)
+        if ((p->e_cursor) && (!p->canvas))
           {
              evas_object_hide(p->pointer_image);
              evas_object_show(p->pointer_object);
           }
-        else
+        else ((p->e_cursor) && (p->canvas))
           {
              evas_object_hide(p->pointer_object);
              evas_object_show(p->pointer_image);

--