nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove the elliptic gradient type.

Browse source 
add bevel light/dark colors for solid textures with bevels
This commit is contained in:
Dana Jansens 2003-05-20 07:28:31 +00:00
parent 97b22bd27b
commit 13f701bdb1
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
render/render.c
View file

@ -333,6 +333,8 @@ Appearance *appearance_new(SurfaceType type, int numtex)
p->primary = NULL; p->primary = NULL;
p->secondary = NULL; p->secondary = NULL;
p->border_color = NULL; p->border_color = NULL;
p->bevel_dark = NULL;
p->bevel_light = NULL;
p->pixel_data = NULL; p->pixel_data = NULL;
break; break;
} }
@ -369,6 +371,18 @@ Appearance *appearance_copy(Appearance *orig)
spo->border_color->b); spo->border_color->b);
else spc->border_color = NULL; else spc->border_color = NULL;
if (spo->bevel_dark != NULL)
spc->bevel_dark = color_new(spo->bevel_dark->r,
spo->bevel_dark->g,
spo->bevel_dark->b);
else spc->bevel_dark = NULL;
if (spo->bevel_light != NULL)
spc->bevel_light = color_new(spo->bevel_light->r,
spo->bevel_light->g,
spo->bevel_light->b);
else spc->bevel_light = NULL;
spc->interlaced = spo->interlaced; spc->interlaced = spo->interlaced;
spc->border = spo->border; spc->border = spo->border;
spc->pixel_data = NULL; spc->pixel_data = NULL;
@ -391,10 +405,12 @@ void appearance_free(Appearance *a)
g_free(a->texture); g_free(a->texture);
if (a->surface.type == Surface_Planar) { if (a->surface.type == Surface_Planar) {
p = &a->surface.data.planar; p = &a->surface.data.planar;
if (p->primary != NULL) color_free(p->primary); color_free(p->primary);
if (p->secondary != NULL) color_free(p->secondary); color_free(p->secondary);
if (p->border_color != NULL) color_free(p->border_color); color_free(p->border_color);
if (p->pixel_data != NULL) g_free(p->pixel_data); color_free(p->bevel_dark);
color_free(p->bevel_light);
g_free(p->pixel_data);
} }
g_free(a); g_free(a);
} }

5
render/render.h
View file

@ -33,8 +33,7 @@ typedef enum {
Background_CrossDiagonal, Background_CrossDiagonal,
Background_PipeCross, Background_PipeCross,
Background_Rectangle, Background_Rectangle,
Background_Pyramid, Background_Pyramid
Background_Elliptic
} SurfaceColorType; } SurfaceColorType;
typedef enum { typedef enum {
@ -53,6 +52,8 @@ typedef struct PlanarSurface {
color_rgb *primary; color_rgb *primary;
color_rgb *secondary; color_rgb *secondary;
color_rgb *border_color; color_rgb *border_color;
color_rgb *bevel_dark;
color_rgb *bevel_light;
gboolean interlaced; gboolean interlaced;
gboolean border; gboolean border;
struct Appearance *parent; struct Appearance *parent;