Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_colordialog.c ewl_colordialog.h ewl_colorpicker.h
Log Message:
Use a unified color struct for the color picker and dialogs.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colordialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_colordialog.c 20 Jun 2005 03:02:59 -0000 1.6
+++ ewl_colordialog.c 20 Jun 2005 04:18:16 -0000 1.7
@@ -37,7 +37,7 @@
Ewl_Widget *hbox;
Ewl_Widget *button;
Ewl_Widget *label;
- Ewl_ColorDialog_Color col;
+ Ewl_Color_Set col;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("cd", cd, FALSE);
@@ -200,7 +200,7 @@
ewl_colordialog_redvalue_changed(Ewl_Widget *w, void *ev_data, void *user_data)
{
Ewl_ColorDialog *cd;
- Ewl_ColorDialog_Color col;
+ Ewl_Color_Set col;
float h, s, v;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -230,7 +230,7 @@
ewl_colordialog_greenvalue_changed(Ewl_Widget *w, void *ev_data, void
*user_data)
{
Ewl_ColorDialog *cd;
- Ewl_ColorDialog_Color col;
+ Ewl_Color_Set col;
float h, s, v;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -261,7 +261,7 @@
ewl_colordialog_bluevalue_changed(Ewl_Widget *w, void *ev_data, void
*user_data)
{
Ewl_ColorDialog *cd;
- Ewl_ColorDialog_Color col;
+ Ewl_Color_Set col;
float h, s, v;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -291,7 +291,7 @@
ewl_colordialog_huevalue_changed(Ewl_Widget *w, void *ev_data, void *user_data)
{
Ewl_ColorDialog *cd;
- Ewl_ColorDialog_Color col;
+ Ewl_Color_Set col;
float h, s, v;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -318,7 +318,7 @@
ewl_colordialog_saturationvalue_changed(Ewl_Widget *w, void *ev_data, void
*user_data)
{
Ewl_ColorDialog *cd;
- Ewl_ColorDialog_Color col;
+ Ewl_Color_Set col;
float h, s, v;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -345,7 +345,7 @@
ewl_colordialog_valuevalue_changed(Ewl_Widget *w, void *ev_data, void
*user_data)
{
Ewl_ColorDialog *cd;
- Ewl_ColorDialog_Color col;
+ Ewl_Color_Set col;
float h, s, v;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -372,7 +372,7 @@
ewl_colordialog_color_valuechanged_cb(Ewl_Widget *w, void *ev_data, void
*user_data)
{
Ewl_ColorDialog *cd;
- Ewl_ColorDialog_Color *col;
+ Ewl_Color_Set *col;
float h, s, v;
char redtext[8], greentext[8], bluetext[8];
char huetext[8], saturationtext[8], valuetext[8];
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colordialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_colordialog.h 17 Jun 2005 16:49:07 -0000 1.2
+++ ewl_colordialog.h 20 Jun 2005 04:18:16 -0000 1.3
@@ -8,13 +8,6 @@
* @{
*/
-typedef struct Ewl_ColorDialog_Color Ewl_ColorDialog_Color;
-
-struct Ewl_ColorDialog_Color
-{
- int r, g, b, a;
-};
-
typedef struct Ewl_ColorDialog Ewl_ColorDialog;
/**
@@ -34,7 +27,7 @@
Ewl_Widget *hue_entry;
Ewl_Widget *saturation_entry;
Ewl_Widget *value_entry;
- Ewl_ColorDialog_Color selected;
+ Ewl_Color_Set selected;
};
Ewl_Widget *ewl_colordialog_new(int r, int g, int b);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colorpicker.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_colorpicker.h 14 Jun 2005 20:59:44 -0000 1.6
+++ ewl_colorpicker.h 20 Jun 2005 04:18:16 -0000 1.7
@@ -8,6 +8,13 @@
* @{
*/
+typedef struct Ewl_Color_Set Ewl_Color_Set;
+
+struct Ewl_Color_Set
+{
+ int r, g, b, a;
+};
+
typedef struct Ewl_ColorPicker Ewl_ColorPicker;
/**
@@ -22,10 +29,7 @@
Ewl_Widget *spectrum;
Ewl_Widget *range;
int drag;
- struct _ewl_colorpicker_color
- {
- int r, g, b, a;
- } selected;
+ Ewl_Color_Set selected;
};
Ewl_Widget *ewl_colorpicker_new();
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
