From 0884a77bfef1a6cf628da4e25bc4658eb91d7fe6 Mon Sep 17 00:00:00 2001 From: Tiago Rezende Campos Falcao Date: Wed, 29 Sep 2010 12:22:41 +0000 Subject: [PATCH] Fix: _event_hook must return EINA_FALSE if widget is disable Author: Helen Fornazier widgets: * button * check * file selector button * radio * toggle SVN revision: 52890 --- src/lib/elc_fileselector_button.c | 1 + src/lib/elm_button.c | 1 + src/lib/elm_check.c | 1 + src/lib/elm_radio.c | 1 + src/lib/elm_toggle.c | 1 + 5 files changed, 5 insertions(+) diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c index bfaabe6..f7764ec 100644 --- a/src/lib/elc_fileselector_button.c +++ b/src/lib/elc_fileselector_button.c @@ -63,6 +63,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; Evas_Event_Key_Down *ev = event_info; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; + if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (strcmp(ev->keyname, "Return") && strcmp(ev->keyname, "space")) return EINA_FALSE; _activate(obj); diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index 5424a42..7213a2e 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -55,6 +55,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; + if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (strcmp(ev->keyname, "Return") && strcmp(ev->keyname, "space")) return EINA_FALSE; _activate(obj); diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index c7abcc0..712e6a8 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -57,6 +57,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; Evas_Event_Key_Down *ev = event_info; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; + if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (strcmp(ev->keyname, "Return") && strcmp(ev->keyname, "space")) return EINA_FALSE; _activate(obj); diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c index 1474828..58f2ea5 100644 --- a/src/lib/elm_radio.c +++ b/src/lib/elm_radio.c @@ -77,6 +77,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; Evas_Event_Key_Down *ev = event_info; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; + if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (strcmp(ev->keyname, "Return") && strcmp(ev->keyname, "space")) return EINA_FALSE; _activate(obj); diff --git a/src/lib/elm_toggle.c b/src/lib/elm_toggle.c index acd5f98..b62be6a 100644 --- a/src/lib/elm_toggle.c +++ b/src/lib/elm_toggle.c @@ -53,6 +53,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; + if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (strcmp(ev->keyname, "Return") && strcmp(ev->keyname, "space")) return EINA_FALSE; elm_toggle_state_set(obj, !wd->state); -- 2.7.4