forked from enlightenment/efl
Fix the toolbar cannot be unselected when it's mode is ELM_OBJECT_SELECT_MODE_ALWAYS.
This commit is contained in:
parent
f6a73beb76
commit
e9313c9525
|
@ -1128,3 +1128,7 @@
|
||||||
|
|
||||||
* Add elm_widget_newest_focus_order_get for knowing the last object(and its focus order) which got focus.
|
* 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.
|
* 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.
|
||||||
|
|
|
@ -177,6 +177,7 @@ Fixes:
|
||||||
* Fix elm_conform didn't set size hint when keypad on.
|
* Fix elm_conform didn't set size hint when keypad on.
|
||||||
* Fix elm_conform didn't change indicator mode when create.
|
* 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.
|
* 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:
|
Removals:
|
||||||
|
|
||||||
|
|
|
@ -1843,10 +1843,16 @@ _access_activate_cb(void *data __UNUSED__,
|
||||||
{
|
{
|
||||||
Elm_Toolbar_Item *it;
|
Elm_Toolbar_Item *it;
|
||||||
it = (Elm_Toolbar_Item *)item;
|
it = (Elm_Toolbar_Item *)item;
|
||||||
|
ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
|
||||||
|
|
||||||
if (elm_widget_item_disabled_get(it)) return;
|
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"));
|
_elm_access_say(E_("Selected"));
|
||||||
_item_select(it);
|
_item_select(it);
|
||||||
|
|
Loading…
Reference in New Issue