From d17009cc6b1f50b8d55e70a0a7ed7cffe86de5fb Mon Sep 17 00:00:00 2001 From: lecoanet Date: Fri, 12 Oct 2001 07:05:39 +0000 Subject: Ajout de l'alpha et suppression des champs X de la structure de gradient. --- generic/Color.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'generic') diff --git a/generic/Color.h b/generic/Color.h index c7ac91e..7dc6659 100644 --- a/generic/Color.h +++ b/generic/Color.h @@ -35,33 +35,24 @@ typedef struct _GradientColor { - int position; /* Color starting position along the gradient axis. + unsigned char position; /* Color starting position along the gradient axis. * This is in percent of the gradient total size. */ - int control; /* Middle-shade position in percent of this color + unsigned char control; /* Middle-shade position in percent of this color * size along the gradient axis. */ + unsigned char alpha; XColor *shades[1]; /* The real shades used to draw this color segment. * The number of shades is constant for all the colors * of a given gradient and is setup in num_shades. */ } ZnGradientColor; typedef struct _Gradient { - Screen *screen; /* Screen on which the gradient will be used. */ - Visual *visual; /* Visual for all windows and pixmaps using - * the gradient. */ - int depth; /* Number of bits per pixel of drawables where - * the gradient will be used. */ - Colormap colormap; /* Colormap out of which pixels are allocated. */ int ref_count; Tcl_HashEntry *hash; - ZnBool realized; char type; /* Either ZN_AXIAL_GRADIENT (lines) or * ZN_RADIAL_GRADIENT (circles). */ union { int angle; /* Angle spec for an axial gradient (Degrees). */ - struct { - int x; /* Center for a radial gradiant (percent of */ - int y; /* area size). */ - } c; + ZnPoint p; /* Center for a radial gradiant. */ } g; int num_shades; /* Number of shades used for each color */ int num_colors; /* Number of colors in gradient spec. */ @@ -81,10 +72,9 @@ ZnGradient *ZnGetReliefGradient(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name); ZnBool ZnGradientFlat(ZnGradient *grad); XColor *ZnGetGradientColor(Tk_Window tkwin, ZnGradient *gradient, - ZnReal position); + ZnReal position, int *alpha); char *ZnNameOfGradient(ZnGradient *gradient); void ZnFreeGradient(ZnGradient *gradient); -void ZnRealizeGradient(ZnGradient *grad, Tk_Window tkwin); #endif /* _Color_h */ -- cgit v1.1