vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the toolbar cannot be unselected when it's mode is ELM_OBJECT_SELECT_MODE_ALWAYS.

This commit is contained in:
Jaehwan Kim 2013-03-08 17:21:38 +09:00
parent f6a73beb76
commit e9313c9525
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/ChangeLog
View File

@ -1128,3 +1128,7 @@
* Add elm_widget_newest_focus_order_get for knowing the last object(and its focus order) which got focus.
* After elm_win is created, if there is no manual focus setting, only elm_win should get focus when focus state is changed.
2013-03-08 Jaehwan Kim
* Fix the toolbar cannot be unselected when it's mode is ELM_OBJECT_SELECT_MODE_ALWAYS.

1
legacy/elementary/NEWS
View File

@ -177,6 +177,7 @@ Fixes:
* Fix elm_conform didn't set size hint when keypad on.
* Fix elm_conform didn't change indicator mode when create.
* After elm_win is created, if there is no manual focus setting, only elm_win should get focus when focus state is changed.
* Fix the toolbar cannot be unselected when it's mode is ELM_OBJECT_SELECT_MODE_ALWAYS.
Removals:

8
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -1843,10 +1843,16 @@ _access_activate_cb(void *data __UNUSED__,
{
Elm_Toolbar_Item *it;
it = (Elm_Toolbar_Item *)item;
ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
if (elm_widget_item_disabled_get(it)) return;
if (!it->selected)
if (it->selected && (sd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS))
{
_elm_access_say(E_("Unselected"));
_item_unselect(it);
}
else
{
_elm_access_say(E_("Selected"));
_item_select(it);