From 55899b0917aa53fe9f07c8a35af6fb6fa8276f2b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 10 Oct 2012 07:11:29 +0000 Subject: [PATCH] don't set border kbd move timeout timer if there's no timeout set, also ensure that kbd moving moves at least 1px when moving ticket #1480 SVN revision: 77700 --- src/bin/e_border.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index c6088bbcb..1926a2cf3 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -3715,9 +3715,11 @@ _e_border_action_move_timeout(void *data __UNUSED__) static void _e_border_action_move_timeout_add(void) { + if (!e_config->border_keyboard.timeout) return; if (action_timer) - ecore_timer_del(action_timer); - action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_move_timeout, NULL); + ecore_timer_reset(action_timer); + else + action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_move_timeout, NULL); } static Eina_Bool @@ -3740,13 +3742,13 @@ _e_border_move_key_down(void *data __UNUSED__, y = action_border->y; if ((strcmp(ev->key, "Up") == 0) || (strcmp(ev->key, "k") == 0)) - y -= _e_border_key_down_modifier_apply(ev->modifiers, e_config->border_keyboard.move.dy); + y -= _e_border_key_down_modifier_apply(ev->modifiers, MAX(e_config->border_keyboard.move.dy, 1)); else if ((strcmp(ev->key, "Down") == 0) || (strcmp(ev->key, "j") == 0)) - y += _e_border_key_down_modifier_apply(ev->modifiers, e_config->border_keyboard.move.dy); + y += _e_border_key_down_modifier_apply(ev->modifiers, MAX(e_config->border_keyboard.move.dy, 1)); else if ((strcmp(ev->key, "Left") == 0) || (strcmp(ev->key, "h") == 0)) - x -= _e_border_key_down_modifier_apply(ev->modifiers, e_config->border_keyboard.move.dx); + x -= _e_border_key_down_modifier_apply(ev->modifiers, MAX(e_config->border_keyboard.move.dx, 1)); else if ((strcmp(ev->key, "Right") == 0) || (strcmp(ev->key, "l") == 0)) - x += _e_border_key_down_modifier_apply(ev->modifiers, e_config->border_keyboard.move.dx); + x += _e_border_key_down_modifier_apply(ev->modifiers, MAX(e_config->border_keyboard.move.dx, 1)); else if (strcmp(ev->key, "Return") == 0) goto stop; else if (strcmp(ev->key, "Escape") == 0)