aboutsummaryrefslogtreecommitdiff
path: root/generic/Item.c
diff options
context:
space:
mode:
authorlecoanet2001-10-24 13:12:12 +0000
committerlecoanet2001-10-24 13:12:12 +0000
commite01f4240a3dc15fa147b22158212536698a12b95 (patch)
treee47faa6b7139082f9c3c526e8b17b400c24c824d /generic/Item.c
parent615729a337312d54e20b88624c88c0c02707b4c7 (diff)
downloadtkzinc-e01f4240a3dc15fa147b22158212536698a12b95.zip
tkzinc-e01f4240a3dc15fa147b22158212536698a12b95.tar.gz
tkzinc-e01f4240a3dc15fa147b22158212536698a12b95.tar.bz2
tkzinc-e01f4240a3dc15fa147b22158212536698a12b95.tar.xz
Ajout d'un alpha aux groupes et expression de l'alpha en pourcent
Diffstat (limited to 'generic/Item.c')
-rw-r--r--generic/Item.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/generic/Item.c b/generic/Item.c
index c47d822..95580d1 100644
--- a/generic/Item.c
+++ b/generic/Item.c
@@ -4348,8 +4348,9 @@ RenderField(WidgetInfo *wi,
#ifdef GLX
int j;
XColor *color;
- int alpha;
-
+ int alpha, alpha2;
+
+ alpha2 = 65535*wi->alpha/100;
/*
* Draw the background.
*/
@@ -4378,7 +4379,8 @@ RenderField(WidgetInfo *wi,
glPolygonStipple(GetBitmapMask(wi->dpy, field_ptr->fill_pattern)->pixels);
}
color = ZnGetGradientColor(wi->win, field_ptr->fill_color, 0.0, &alpha);
- glColor4us(color->red, color->green, color->blue, alpha*65535/100);
+ alpha = alpha*wi->alpha/100*65535/100;
+ glColor4us(color->red, color->green, color->blue, alpha);
FieldRenderCB(clip_bbox);
glDisable(GL_POLYGON_STIPPLE);
}
@@ -4412,7 +4414,7 @@ RenderField(WidgetInfo *wi,
glEnable(GL_TEXTURE_2D);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
color = field_ptr->color;
- glColor4us(color->red, color->green, color->blue, 65535);
+ glColor4us(color->red, color->green, color->blue, alpha2);
glBindTexture(GL_TEXTURE_2D, field_ptr->txf->texobj);
glPushMatrix();
glTranslatef(text_pos->x, text_pos->y, 0.0);
@@ -4444,7 +4446,7 @@ RenderField(WidgetInfo *wi,
*/
if (field_ptr->border_edges != NO_BORDER) {
color = field_ptr->border_color;
- glColor4us(color->red, color->green, color->blue, 65535);
+ glColor4us(color->red, color->green, color->blue, alpha2);
glLineWidth(1);
glBegin(GL_LINES);
if (field_ptr->border_edges & LEFT_BORDER) {
@@ -4756,6 +4758,10 @@ Repair(WidgetInfo *wi)
RenderTile(wi, GetImageTexture(wi->win, wi->tile_name, wi->tile),
NULL, NULL, NULL, (ZnPoint *) &bbox);
}
+ /*
+ * Init the composite group alpha.
+ */
+ wi->alpha = 100;
glEnable(GL_POINT_SMOOTH);
glEnable(GL_LINE_SMOOTH);