jaehwan pushed a commit to branch master.
commit 26ff7e9a2e1878b8eb271d889923a6758b5f5a22
Author: Jaehwan Kim <[email protected]>
Date: Fri Mar 8 17:21:38 2013 +0900
Fix the toolbar cannot be unselected when it's mode is
ELM_OBJECT_SELECT_MODE_ALWAYS.
---
ChangeLog | 4 ++++
NEWS | 1 +
src/lib/elm_toolbar.c | 8 +++++++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index f900e10..fa4492e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/NEWS b/NEWS
index ca97638..924ae0e 100644
--- a/NEWS
+++ b/NEWS
@@ -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:
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index d0f6759..b741706 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -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);
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
