projects
/
platform
/
upstream
/
enlightenment.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ce5d2d
)
bugfix: Properly hide/show pointer_image & pointer_object based on if
author
Chris Michael
<cp.michael@samsung.com>
Thu, 20 Mar 2014 14:15:47 +0000
(14:15 +0000)
committer
Chris Michael
<cp.michael@samsung.com>
Thu, 20 Mar 2014 14:16:42 +0000
(14:16 +0000)
the pointer is located on an existing canvas
Signed-off-by: Chris Michael <cp.michael@samsung.com>
src/bin/e_pointer.c
patch
|
blob
|
history
diff --git
a/src/bin/e_pointer.c
b/src/bin/e_pointer.c
index
e3ea4a9
..
084e256
100644
(file)
--- 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);