projects
/
framework
/
uifw
/
elementary.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[access] support back gesture
[framework/uifw/elementary.git]
/
src
/
lib
/
elm_access.c
diff --git
a/src/lib/elm_access.c
b/src/lib/elm_access.c
index
6cf2d32
..
f72f897
100644
(file)
--- a/
src/lib/elm_access.c
+++ b/
src/lib/elm_access.c
@@
-77,6
+77,10
@@
_elm_access_smart_activate(Evas_Object *obj, Elm_Activate act)
case ELM_ACTIVATE_LEFT:
break;
case ELM_ACTIVATE_LEFT:
break;
+ case ELM_ACTIVATE_BACK:
+ type = ELM_ACCESS_ACTION_BACK;
+ break;
+
default:
break;
}
default:
break;
}
@@
-686,17
+690,32
@@
_elm_access_activate_callback_set(Elm_Access_Info *ac,
EAPI void
_elm_access_highlight_object_activate(Evas_Object *obj, Elm_Activate act)
{
EAPI void
_elm_access_highlight_object_activate(Evas_Object *obj, Elm_Activate act)
{
- Evas_Object *h
ighlight
;
+ Evas_Object *h
o
;
- h
ighlight
= _access_highlight_object_get(obj);
- if (!h
ighlight
) return;
+ h
o
= _access_highlight_object_get(obj);
+ if (!h
o
) return;
- _elm_access_read_mode_set(EINA_FALSE);
+ switch (act)
+ {
+ case ELM_ACTIVATE_DEFAULT:
+ case ELM_ACTIVATE_UP:
+ case ELM_ACTIVATE_DOWN:
+ _elm_access_read_mode_set(EINA_FALSE);
+
+ if (!elm_object_focus_get(ho))
+ elm_object_focus_set(ho, EINA_TRUE);
- if (!elm_object_focus_get(highlight))
- elm_object_focus_set(highlight, EINA_TRUE);
+ elm_widget_activate(ho, act);
+ break;
+
+ case ELM_ACTIVATE_BACK:
+ elm_widget_activate(ho, act);
+ break;
+
+ default:
+ break;
+ }
- elm_widget_activate(highlight, act);
return;
}
return;
}
@@
-1313,6
+1332,7
@@
elm_access_action(Evas_Object *obj, const Elm_Access_Action_Type type, void *act
break;
case ELM_ACCESS_ACTION_SCROLL:
break;
case ELM_ACCESS_ACTION_SCROLL:
+ _elm_access_highlight_object_scroll(obj, a->mouse_type, a->x, a->y);
break;
case ELM_ACCESS_ACTION_BACK:
break;
case ELM_ACCESS_ACTION_BACK: