From 2bbb2dac16172ba6bc24c86e87957d5c9ed59380 Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Fri, 7 Dec 2012 10:54:04 +0000 Subject: [PATCH] [elementary/multibutton_entry] Fix focus problem in multibuttonentry. Entry can get focus only when multibuttonentry is focused. SVN revision: 80433 --- legacy/elementary/ChangeLog | 3 +++ legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elc_multibuttonentry.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index c244d2129d..4e189be714 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -789,3 +789,6 @@ * Safer call to mkstemp in elm_cnp. * Simplify test in elm_entry_text_set. +2012-12-07 WooHyun Jung + + * Fix focus problem in multibuttonentry. Entry can get focus only when multibuttonentry is focused. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 1eace90406..34ffd14cf4 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -85,6 +85,7 @@ Fixes: have resized, it wouldn't be showed up. * Safer call to mkstemp in elm_cnp. * Simplify test in elm_entry_text_set. + * Fix focus problem in multibuttonentry. Entry can get focus only when multibuttonentry is focused. Removals: diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index bbb3707f47..af8f8df2df 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -884,7 +884,7 @@ _mouse_clicked_signal_cb(void *data, _view_update(sd); - if (sd->editable) + if (elm_widget_focus_get(data) && sd->editable) { elm_entry_input_panel_show(sd->entry); elm_object_focus_set(sd->entry, EINA_TRUE);