discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7264ac9e9623fab032989fe991ec712a3e169599
commit 7264ac9e9623fab032989fe991ec712a3e169599 Author: Mike Blumenkrantz <[email protected]> Date: Fri Jan 6 12:56:22 2017 -0500 resolve binding+action float-equal warnings Reviewed-by: Derek Foreman <[email protected]> --- src/bin/e_actions.c | 14 +++++--------- src/bin/e_bindings.c | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 8e0b8fc..42a716f 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -1882,18 +1882,14 @@ ACT_FN_GO(exec, ) { E_Zone *zone; static double lock; + double test; /* prevent exec actions from occurring too frequently */ - if (lock) + test = ecore_loop_time_get(); + if (test - lock < 0.05) { - double test; - - test = ecore_loop_time_get(); - if (test - lock < 0.05) - { - lock = test; - return; - } + lock = test; + return; } lock = ecore_loop_time_get(); zone = _e_actions_zone_get(obj); diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c index 2c6b0c4..9a3f395 100644 --- a/src/bin/e_bindings.c +++ b/src/bin/e_bindings.c @@ -831,7 +831,7 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_onl { if ((binding->ctxt == ctxt) && (binding->mod == mod) && - ((binding->delay * 1000) == (delay * 1000)) && + EINA_FLT_CMP(binding->delay, delay) && (binding->any_mod == any_mod) && (binding->drag_only == drag_only) && (((binding->action) && (action) && (!strcmp(binding->action, action))) || @@ -862,7 +862,7 @@ e_bindings_edge_event_find(E_Binding_Context ctxt, E_Event_Zone_Edge *ev, Eina_B EINA_LIST_FOREACH(edge_bindings, l, binding) /* A value of <= -1.0 for the delay indicates it as a mouse-click binding on that edge */ if (((binding->edge == ev->edge)) && - ((click && (binding->delay == -1.0 * click)) || (!click && (binding->delay >= 0.0))) && + ((click && EINA_FLT_CMP(binding->delay, -1.0 * click)) || (!click && (binding->delay >= 0.0))) && ((binding->drag_only == ev->drag) || ev->drag) && ((binding->any_mod) || (binding->mod == mod))) { --
