Ajout d'un alpha aux groupes et expression de l'alpha en pourcent

1 files changed, 10 insertions, 10 deletions

diff --git a/generic/Draw.c b/generic/Draw.c
index ed8d3ce..1ec7f88 100644
--- a/generic/Draw.c
+++ b/generic/Draw.c
@@ -890,7 +890,7 @@ PolygonRenderCB(ZnPoint	*bevels,
   XColor	*color = ReliefColorOfSegment(bevels[0].x, bevels[0].y,
 					      bevels[3].x, bevels[3].y,
 					      pd->relief, pd->gradient, pd->wi);
-  glColor4us(color->red, color->green, color->blue, pd->alpha*65535/100);
+  glColor4us(color->red, color->green, color->blue, pd->alpha);
   glBegin(GL_QUADS);
   for (i = 0; i < 4; i++) {
     glVertex2f(bevels[i].x, bevels[i].y);
@@ -914,7 +914,7 @@ RenderPolygonRelief(WidgetInfo	*wi,
 
   pd.wi = wi;
   pd.gradient = gradient;
-  pd.alpha = alpha;
+  pd.alpha = alpha*wi->alpha/100*65535/100;
   pd.smooth = smooth;
   glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);	  
 
@@ -943,7 +943,7 @@ RenderImage(struct _WidgetInfo	*wi,
 {
   ZnReal nx, ny;
 
-  alpha = alpha*65535/100;
+  alpha = alpha*wi->alpha/100*65535/100;
   nx = origin->x + image->width;
   ny = origin->y + image->height;
   glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
@@ -982,10 +982,10 @@ RenderTile(struct _WidgetInfo	*wi,
   
   if (gradient) {
     ZnGetGradientColor(wi->win, gradient, 0.0, &alpha);
-    alpha = alpha*65535/100;
+    alpha = alpha*wi->alpha/100*65535/100;
   }
   else {
-    alpha = 65535;
+    alpha = 65535*wi->alpha/100;
   }
   
   if (cb) {
@@ -1143,7 +1143,7 @@ RenderGradient(struct _WidgetInfo	*wi,
     glBegin(GL_QUAD_STRIP);
     for (i = 0; i < gradient->num_colors; i++) {
       color = gradient->colors[i]->shades[0];
-      alpha = gradient->colors[i]->alpha*65535/100;
+      alpha = gradient->colors[i]->alpha*wi->alpha/100*65535/100;
       glColor4us(color->red, color->green, color->blue, alpha);
 
       pos = gradient->colors[i]->position;
@@ -1162,7 +1162,7 @@ RenderGradient(struct _WidgetInfo	*wi,
       
       if ((control != 50.0) && (i != gradient->num_colors-1)) {
 	color = gradient->colors[i]->shades[num_shades/2];
-	alpha = gradient->colors[i]->alpha*65535/100;
+	alpha = gradient->colors[i]->alpha*wi->alpha/100*65535/100;
 	glColor4us(color->red, color->green, color->blue, alpha);
 	
 	npos = gradient->colors[i+1]->position;
@@ -1195,14 +1195,14 @@ RenderGradient(struct _WidgetInfo	*wi,
     genarc = GetCirclePoints(3, ZN_CIRCLE_MEDIUM, 0, 360, &num_p, NULL);
     radius = 0;
     color = gradient->colors[0]->shades[0];
-    alpha = gradient->colors[0]->alpha*65535/100;
+    alpha = gradient->colors[0]->alpha*wi->alpha/100*65535/100;
     control = gradient->colors[0]->control;
     for (j = 1; j < gradient->num_colors; j++) {
       radius2 = quad[1].x*gradient->colors[j]->position/100.0;
       if ((control != 50) && (j != gradient->num_colors-1)) {
 	glBegin(GL_QUAD_STRIP);
 	color2 = gradient->colors[j-1]->shades[num_shades/2];
-	alpha2 = gradient->colors[j-1]->alpha*65535/100;
+	alpha2 = gradient->colors[j-1]->alpha*wi->alpha/100*65535/100;
 	radius3 = radius + (radius2-radius)*control/100.0;
 	for (i = 0; i < num_p; i++) {
 	  x = quad[0].x+genarc[i].x*radius;
@@ -1221,7 +1221,7 @@ RenderGradient(struct _WidgetInfo	*wi,
       }
       glBegin(GL_QUAD_STRIP);
       color2 = gradient->colors[j]->shades[0];
-      alpha2 = gradient->colors[j]->alpha*65535/100;
+      alpha2 = gradient->colors[j]->alpha*wi->alpha/100*65535/100;
       for (i = 0; i < num_p; i++) {
 	x = quad[0].x+genarc[i].x*radius;
 	y = quad[0].y+genarc[i].y*radius;