From aa0e82dda6d7b91d3f5cfd71fadee0e36abb7fb6 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 1 Feb 2013 12:39:39 +0000 Subject: [PATCH] fix behavior of up/down keys in efm when typebuf is visible SVN revision: 83560 --- ChangeLog | 1 + NEWS | 1 + src/bin/e_fm.c | 14 ++------------ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0bc091bc..49cba4a9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * binding dialogs now reload the default config from file when reset defaults is clicked * fixed leak in profile list dbus method * binding dialogs are now able to reset bindings to the system profile file bindings + * fixed behavior of Up/Down keys in filemanager when typebuf was visible 2013-01-31 Mike Blumenkrantz diff --git a/NEWS b/NEWS index 1ca7f8520..45a21731b 100644 --- a/NEWS +++ b/NEWS @@ -135,3 +135,4 @@ Fixes: * filemanager now ignores changes to .part files * fixed bugs where keyboard layouts could not be applied or selected * fixed leak in profile list dbus method + * fixed behavior of Up/Down keys in filemanager when typebuf was visible diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index be6797d5a..64626435b 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -7730,24 +7730,14 @@ _e_fm2_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event } else if (!strcmp(ev->key, "Up")) { - if (sd->typebuf_visible) - /* FIXME: icon mode, typebuf extras */ - /* is there a way to use this atm? */ - // _e_fm2_typebuf_history_prev(obj); - _e_fm2_typebuf_match(obj, -1); - else if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST) + if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST) _e_fm2_icon_sel_prev(obj, evas_key_modifier_is_set(ev->modifiers, "Shift")); else _e_fm2_icon_sel_up(obj, evas_key_modifier_is_set(ev->modifiers, "Shift")); } else if (!strcmp(ev->key, "Down")) { - if (sd->typebuf_visible) - /* FIXME: icon mode, typebuf extras */ - /* is there a way to use this? */ - //_e_fm2_typebuf_history_next(obj); - _e_fm2_typebuf_match(obj, 1); - else if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST) + if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST) _e_fm2_icon_sel_next(obj, evas_key_modifier_is_set(ev->modifiers, "Shift")); else _e_fm2_icon_sel_down(obj, evas_key_modifier_is_set(ev->modifiers, "Shift"));