Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_color_dialog.c e_widget_color_well.c e_color_dialog.h
Log Message:
store the initial color when opening a color dialog, and return that on cancel
use this in color well
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_color_dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_color_dialog.c 14 Oct 2006 04:54:44 -0000 1.9
+++ e_color_dialog.c 14 Oct 2006 05:04:01 -0000 1.10
@@ -29,12 +29,15 @@
e_dialog_title_set(dia->dia, "Color Selector");
dia->color = calloc(1, sizeof(E_Color));
+ dia->initial = calloc(1, sizeof(E_Color));
if (color)
e_color_copy(color, dia->color);
else
dia->color->a = 255;
+ e_color_copy(dia->color, dia->initial);
+
o = e_widget_csel_add(dia->dia->win->evas, dia->color);
evas_object_show(o);
e_widget_min_size_get(o, &mw, &mh);
@@ -114,8 +117,8 @@
E_Color_Dialog *dia;
dia = data;
- if(dia->cancel_func && dia->color)
- dia->cancel_func(dia, dia->color, dia->cancel_data);
+ if(dia->cancel_func && dia->initial)
+ dia->cancel_func(dia, dia->initial, dia->cancel_data);
_e_color_dialog_free(data);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_color_well.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_widget_color_well.c 14 Oct 2006 04:54:44 -0000 1.12
+++ e_widget_color_well.c 14 Oct 2006 05:04:01 -0000 1.13
@@ -71,6 +71,9 @@
{
E_Widget_Data *wd;
wd = data;
+ /* cancel sends the original color back */
+ e_color_copy(color, wd->color);
+ _e_wid_update(wd);
wd->dia = NULL;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_color_dialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_color_dialog.h 14 Oct 2006 04:50:00 -0000 1.5
+++ e_color_dialog.h 14 Oct 2006 05:04:01 -0000 1.6
@@ -18,7 +18,7 @@
E_Container *con;
E_Dialog *dia;
- E_Color *color;
+ E_Color *color, *initial;
void (*select_func)(E_Color_Dialog *dia, E_Color *color, void *data);
void *select_data;
@@ -31,6 +31,8 @@
EAPI E_Color_Dialog *e_color_dialog_new (E_Container *con,
const E_Color *initial_color);
EAPI void e_color_dialog_show (E_Color_Dialog *dia);
EAPI void e_color_dialog_title_set (E_Color_Dialog *dia,
const char *title);
+
+/* select and change pass the current color back, cancel passes the initial
color */
EAPI void e_color_dialog_select_callback_set(E_Color_Dialog *dia,
void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
EAPI void e_color_dialog_cancel_callback_set(E_Color_Dialog *dia,
void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
EAPI void e_color_dialog_change_callback_set(E_Color_Dialog *dia,
void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
