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

shrink the area that the textures are rendered into by the bevels/borders

Browse source
This commit is contained in:
Dana Jansens 2003-04-14 22:12:18 +00:00
parent d4b20aef31
commit 1afb1a7cc8
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
render/render.c
View file

@ -197,6 +197,7 @@ void x_paint(Window win, Appearance *l)
int y = l->area.y; int y = l->area.y;
int w = l->area.width; int w = l->area.width;
int h = l->area.height; int h = l->area.height;
Rect tarea; /* area in which to draw textures */
if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return; if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return;
@ -231,6 +232,23 @@ void x_paint(Window win, Appearance *l)
else gradient_render(&l->surface, w, h); else gradient_render(&l->surface, w, h);
for (i = 0; i < l->textures; i++) { for (i = 0; i < l->textures; i++) {
tarea = l->texture[i].position;
if (l->surface.data.planar.relief != Flat) {
switch (l->surface.data.planar.bevel) {
case Bevel1:
tarea.x += 1; tarea.y += 1;
tarea.width -= 2; tarea.height -= 2;
break;
case Bevel2:
tarea.x += 2; tarea.y += 2;
tarea.width -= 4; tarea.height -= 4;
break;
}
} else if (l->surface.data.planar.border) {
tarea.x += 1; tarea.y += 1;
tarea.width -= 2; tarea.height -= 2;
}
switch (l->texture[i].type) { switch (l->texture[i].type) {
case Text: case Text:
if (!transferred) { if (!transferred) {
@ -244,7 +262,7 @@ void x_paint(Window win, Appearance *l)
render_visual, render_colormap); render_visual, render_colormap);
} }
font_draw(l->xftdraw, &l->texture[i].data.text, font_draw(l->xftdraw, &l->texture[i].data.text,
&l->texture[i].position); &tarea);
break; break;
case Bitmask: case Bitmask:
if (!transferred) { if (!transferred) {
@ -256,12 +274,12 @@ void x_paint(Window win, Appearance *l)
if (l->texture[i].data.mask.color->gc == None) if (l->texture[i].data.mask.color->gc == None)
color_allocate_gc(l->texture[i].data.mask.color); color_allocate_gc(l->texture[i].data.mask.color);
mask_draw(l->pixmap, &l->texture[i].data.mask, mask_draw(l->pixmap, &l->texture[i].data.mask,
&l->texture[i].position); &tarea);
break; break;
case RGBA: case RGBA:
image_draw(l->surface.data.planar.pixel_data, image_draw(l->surface.data.planar.pixel_data,
&l->texture[i].data.rgba, &l->texture[i].data.rgba,
&l->texture[i].position); &tarea);
break; break;
} }
} }
@ -405,11 +423,17 @@ void appearance_minsize(Appearance *l, Size *s)
switch (l->surface.type) { switch (l->surface.type) {
case Surface_Planar: case Surface_Planar:
if (l->surface.data.planar.border || if (l->surface.data.planar.relief != Flat) {
l->surface.data.planar.bevel == Bevel1) switch (l->surface.data.planar.bevel) {
case Bevel1:
SIZE_SET(*s, 2, 2);
break;
case Bevel2:
SIZE_SET(*s, 4, 4);
break;
}
} else if (l->surface.data.planar.border)
SIZE_SET(*s, 2, 2); SIZE_SET(*s, 2, 2);
else if (l->surface.data.planar.bevel == Bevel2)
SIZE_SET(*s, 4, 4);
for (i = 0; i < l->textures; ++i) for (i = 0; i < l->textures; ++i)
switch (l->texture[i].type) { switch (l->texture[i].type) {