From ba1c46d46c83860b6b14dac2c6359cc9992a33c3 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Thu, 23 May 2013 17:23:19 +0900 Subject: [PATCH] elm_colorselector.c: Set the colorselector color first before calling "color,item,selected" callback. Special thanks to Ryuan Choi. This was detected while reviewing his patch. --- ChangeLog | 4 ++++ NEWS | 1 + src/lib/elm_colorselector.c | 8 ++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7175dae..182bd4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1356,3 +1356,7 @@ 2013-05-17 Thiep Ha * Add selection handlers to entry. + +2013-05-23 Daniel Juyung Seo (SeoZ) + + * Fix colorselector color change but when palette item is selected. diff --git a/NEWS b/NEWS index 7b115c0..1dba3b8 100644 --- a/NEWS +++ b/NEWS @@ -230,6 +230,7 @@ Fixes: * Fix elm_clock_first_interval_set writes wrong value. * Fix remained ecore timer issue when gesture layer was deleted. * Fix ctxpopup can't be called again in the mobile mode entry. + * Fix colorselector color change but when palette item is selected. Removals: diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index 2bb677a..5d9bed9 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -1308,11 +1308,11 @@ _on_color_released(void *data, elm_object_signal_emit(VIEW(item), "elm,state,unselected", "elm"); if (!sd->longpressed) { - evas_object_smart_callback_call - (WIDGET(item), SIG_COLOR_ITEM_SELECTED, item); elm_colorselector_color_set (WIDGET(item), item->color->r, item->color->g, item->color->b, item->color->a); + evas_object_smart_callback_call + (WIDGET(item), SIG_COLOR_ITEM_SELECTED, item); } EINA_LIST_FOREACH(sd->items, l, temp_item) if (item == temp_item) sd->selected = l; @@ -1732,10 +1732,10 @@ _elm_colorselector_smart_event(Eo *obj, void *_pd, va_list *list) { item = eina_list_data_get(cl); elm_object_signal_emit(VIEW(item), "elm,anim,activate", "elm"); - evas_object_smart_callback_call - (WIDGET(item), SIG_COLOR_ITEM_SELECTED, item); elm_colorselector_color_set (WIDGET(item), item->color->r, item->color->g, item->color->b, + evas_object_smart_callback_call + (WIDGET(item), SIG_COLOR_ITEM_SELECTED, item); item->color->a); sd->selected = cl; } -- 2.7.4