From 1fde0e2c0454ca04b1ca98621f0e57b9e212e7e3 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Thu, 20 Oct 2011 21:49:54 +0000 Subject: [PATCH] more unnoticeable internal movements git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64211 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_gengrid.c | 3 +-- src/lib/elm_genlist.c | 27 +++++++++++---------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index efff56b..fb9526b 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -325,8 +325,7 @@ _event_hook(Evas_Object *obj, ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } - else if ((!strcmp(ev->keyname, "Prior")) || - (!strcmp(ev->keyname, "KP_Prior"))) + else if ((!strcmp(ev->keyname, "Prior")) || (!strcmp(ev->keyname, "KP_Prior"))) { if (wd->horizontal) { diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index a5332e1..172687a 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -354,8 +354,7 @@ _event_hook(Evas_Object *obj, { x -= step_x; } - else if ((!strcmp(ev->keyname, "Right")) || - (!strcmp(ev->keyname, "KP_Right"))) + else if ((!strcmp(ev->keyname, "Right")) || (!strcmp(ev->keyname, "KP_Right"))) { x += step_x; } @@ -383,38 +382,40 @@ _event_hook(Evas_Object *obj, else y += step_y; } - else if ((!strcmp(ev->keyname, "Home")) || - (!strcmp(ev->keyname, "KP_Home"))) + else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) { it = elm_genlist_first_item_get(obj); elm_genlist_item_bring_in(it); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } - else if ((!strcmp(ev->keyname, "End")) || - (!strcmp(ev->keyname, "KP_End"))) + else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) { it = elm_genlist_last_item_get(obj); elm_genlist_item_bring_in(it); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } - else if ((!strcmp(ev->keyname, "Prior")) || - (!strcmp(ev->keyname, "KP_Prior"))) + else if ((!strcmp(ev->keyname, "Prior")) || (!strcmp(ev->keyname, "KP_Prior"))) { if (page_y < 0) y -= -(page_y * v_h) / 100; else y -= page_y; } - else if ((!strcmp(ev->keyname, "Next")) || - (!strcmp(ev->keyname, "KP_Next"))) + else if ((!strcmp(ev->keyname, "Next")) || (!strcmp(ev->keyname, "KP_Next"))) { if (page_y < 0) y += -(page_y * v_h) / 100; else y += page_y; } + else if (!strcmp(ev->keyname, "Escape")) + { + if (!_deselect_all_items(wd)) return EINA_FALSE; + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + return EINA_TRUE; + } else if (((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->keyname, "space"))) @@ -425,12 +426,6 @@ _event_hook(Evas_Object *obj, !elm_genlist_item_expanded_get(it)); evas_object_smart_callback_call(it->base.widget, SIG_ACTIVATED, it); } - else if (!strcmp(ev->keyname, "Escape")) - { - if (!_deselect_all_items(wd)) return EINA_FALSE; - ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - return EINA_TRUE; - } else return EINA_FALSE; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; -- 2.7.4