summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-06-23 17:43:58 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-06-23 17:43:44 -0400
commit990a9d485dd5097f1a96b1e6c3b16177a542791b (patch)
treebb9db9c6d399fac8ffd9abeda0ffaf14f3147277
parent7b4e9f5d772185ce6d0bcb58728038fab869a352 (diff)
downloadefl-990a9d485dd5097f1a96b1e6c3b16177a542791b.tar.gz
elm_list/genlist/gengrid: don't unselect items when moving the mouse out of them
this seems wrong since it's using smart object geometry to determine event-based positioning within an edje object. considering it from a user pov, it definitely is wrong because why would you deselect items based on mouse movement? ref D2622 ref da81eff8979bef066317984d606dd66bdba49717 @fix
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_list.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index c2470844a7..edcc031128 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -743,7 +743,7 @@ _item_mouse_move_cb(void *data,
}
}
}
- else if (ELM_RECTS_POINT_OUT(x, y, w, h, ev->cur.canvas.x, ev->cur.canvas.y) &&
+ else if (it->down && ELM_RECTS_POINT_OUT(x, y, w, h, ev->cur.canvas.x, ev->cur.canvas.y) &&
!sd->reorder_it )
{
ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 02e5e9e650..712d6f0e08 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3871,7 +3871,7 @@ _item_mouse_move_cb(void *data,
_item_unselect(it);
}
}
- else if (ELM_RECTS_POINT_OUT(x, y, w, h, ev->cur.canvas.x, ev->cur.canvas.y) &&
+ else if (it->down && ELM_RECTS_POINT_OUT(x, y, w, h, ev->cur.canvas.x, ev->cur.canvas.y) &&
!sd->reorder_it)
{
ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 3adae9a7f4..cca92bd46a 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1622,7 +1622,7 @@ _mouse_move_cb(void *data,
}
}
}
- else if (ELM_RECTS_POINT_OUT(x, y, w, h, ev->cur.canvas.x, ev->cur.canvas.y))
+ else if (sd->mouse_down && ELM_RECTS_POINT_OUT(x, y, w, h, ev->cur.canvas.x, ev->cur.canvas.y))
{
ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
if (!sd->was_selected)