aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-08 08:14:44 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-08 08:14:44 +0000
commit76e47a970ec45d5bf2563471cd9d935df2fbd818 (patch)
tree22e5439b63f7b1b3e1852c44266ed09f4c049363
parent0a99a25febe6ed0ac774d9d5089c90daa2165159 (diff)
downloadenlightenment-76e47a970ec45d5bf2563471cd9d935df2fbd818.tar.gz
enlightenment-76e47a970ec45d5bf2563471cd9d935df2fbd818.tar.xz
enlightenment-76e47a970ec45d5bf2563471cd9d935df2fbd818.zip
backport previous commit
SVN revision: 82387
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_border.c12
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 72e240564..84017b508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-07 Mike Blumenkrantz
+
+ * Fixed bug where keyboard resizing of windows would not be possible if timeout was set to zero
+
2013-01-07 Tom "TAsn" Hacohen
* e_entry + e_scrollable: Fixed issues with smart members.
diff --git a/NEWS b/NEWS
index 1570deab5..1d3ee3be5 100644
--- a/NEWS
+++ b/NEWS
@@ -19,3 +19,4 @@ Fixes:
* Fix build with uClibc
* Restore default keybindings no longer restores two bindings for ctrl+alt+f
* entry/scrollframe: Fixed issues with submembers.
+ * Fixed bug where keyboard resizing of windows would not be possible if timeout was set to zero
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 8f0eedc89..51122195b 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -3789,10 +3789,8 @@ _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_reset(action_timer);
- else
+ E_FN_DEL(ecore_timer_del, action_timer);
+ if (e_config->border_keyboard.timeout)
action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_move_timeout, NULL);
}
@@ -3902,9 +3900,9 @@ _e_border_action_resize_timeout(void *data __UNUSED__)
static void
_e_border_action_resize_timeout_add(void)
{
- if (action_timer)
- ecore_timer_del(action_timer);
- action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_resize_timeout, NULL);
+ E_FN_DEL(ecore_timer_del, action_timer);
+ if (e_config->border_keyboard.timeout)
+ action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_resize_timeout, NULL);
}
static Eina_Bool