diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index d898765654..8da13bd4bb 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -1380,3 +1380,7 @@ 2013-05-30 ChunEon Park * Fix the mapbuf to be enabled before it's content is entirely rendered once. + +2013-06-05 Ryuan Choi (ryuan) + + * Fix elm_colorselector does not update color bar when picker changed color. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index a41f745dda..60df92ad08 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -236,6 +236,7 @@ Fixes: * Fix colorselector color change but when palette item is selected. * Fix elm_colorselector does not emit "changed" when clicked color palatte. * Fix elm_mapbuf to be enabled before it's content is entirely rendered once. this will reduce the cases that content is not updated in the screen. + * Fix elm_colorselector does not update color bar when picker changed color. Removals: diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c index bedf184935..df3329531f 100644 --- a/legacy/elementary/src/lib/elm_colorselector.c +++ b/legacy/elementary/src/lib/elm_colorselector.c @@ -522,6 +522,7 @@ _mouse_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__) { const unsigned int *pixels; Evas_Object *o = data; + int r, g, b; /* mouse up => check it */ ELM_COLORSELECTOR_DATA_GET(o, sd); @@ -533,11 +534,11 @@ _mouse_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__) sd->grab.mouse_motion = ecore_event_handler_add(ECORE_X_RAW_MOTION, _mouse_grab_pixels, o); pixels = evas_object_image_data_get(sd->picker_display, EINA_FALSE); - sd->a = 0xff; - sd->r = (pixels[17 * 9 + 9] >> 16) & 0xFF; - sd->g = (pixels[17 * 9 + 9] >> 8) & 0xFF; - sd->b = pixels[17 * 9 + 9] & 0xFF; + r = (pixels[17 * 9 + 9] >> 16) & 0xFF; + g = (pixels[17 * 9 + 9] >> 8) & 0xFF; + b = pixels[17 * 9 + 9] & 0xFF; + _colors_set(o, r, g, b, 0xFF); _color_picker_init(sd); return EINA_TRUE;