forked from enlightenment/efl
elm_colorselector: Update color bar when color was picked by color picker.
This commit is contained in:
parent
b0fd75c82b
commit
287f3cee1c
|
@ -1380,3 +1380,7 @@
|
||||||
2013-05-30 ChunEon Park
|
2013-05-30 ChunEon Park
|
||||||
* Fix the mapbuf to be enabled before it's content is entirely rendered
|
* Fix the mapbuf to be enabled before it's content is entirely rendered
|
||||||
once.
|
once.
|
||||||
|
|
||||||
|
2013-06-05 Ryuan Choi (ryuan)
|
||||||
|
|
||||||
|
* Fix elm_colorselector does not update color bar when picker changed color.
|
||||||
|
|
|
@ -236,6 +236,7 @@ Fixes:
|
||||||
* Fix colorselector color change but when palette item is selected.
|
* Fix colorselector color change but when palette item is selected.
|
||||||
* Fix elm_colorselector does not emit "changed" when clicked color palatte.
|
* 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_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:
|
Removals:
|
||||||
|
|
||||||
|
|
|
@ -522,6 +522,7 @@ _mouse_up_cb(void *data, int type __UNUSED__, void *event __UNUSED__)
|
||||||
{
|
{
|
||||||
const unsigned int *pixels;
|
const unsigned int *pixels;
|
||||||
Evas_Object *o = data;
|
Evas_Object *o = data;
|
||||||
|
int r, g, b;
|
||||||
|
|
||||||
/* mouse up => check it */
|
/* mouse up => check it */
|
||||||
ELM_COLORSELECTOR_DATA_GET(o, sd);
|
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);
|
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);
|
pixels = evas_object_image_data_get(sd->picker_display, EINA_FALSE);
|
||||||
sd->a = 0xff;
|
r = (pixels[17 * 9 + 9] >> 16) & 0xFF;
|
||||||
sd->r = (pixels[17 * 9 + 9] >> 16) & 0xFF;
|
g = (pixels[17 * 9 + 9] >> 8) & 0xFF;
|
||||||
sd->g = (pixels[17 * 9 + 9] >> 8) & 0xFF;
|
b = pixels[17 * 9 + 9] & 0xFF;
|
||||||
sd->b = pixels[17 * 9 + 9] & 0xFF;
|
|
||||||
|
|
||||||
|
_colors_set(o, r, g, b, 0xFF);
|
||||||
_color_picker_init(sd);
|
_color_picker_init(sd);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
|
Loading…
Reference in New Issue