mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-06 07:15:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reuse common code for raised and sunken bevels

Browse source
This commit is contained in:
Jack Zeal 2026-04-01 19:39:24 -07:00
parent bfd4364ba9
commit fe44a2e9b3
2 changed files with 12 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/common/borderset.h
View file

@ -4,7 +4,7 @@
#define LABWC_BORDERSET_H
enum border_type {
BORDER_FLAT, BORDER_SINGLE, BORDER_DOUBLE, BORDER_INSET
BORDER_FLAT, BORDER_SINGLE, BORDER_DOUBLE, BORDER_INSET, BORDER_DOUBLE_INSET
};
struct borderset {

39
src/common/borderset.c
View file

@ -74,7 +74,7 @@ struct borderset * createBuffer(uint32_t id, int size, enum border_type type, i
| ((uint32_t)g1 << 8) | (uint32_t)b1;
uint32_t ll32 = ((uint32_t)a << 24) | ((uint32_t)r0 << 16)
| ((uint32_t)g0 << 8) | (uint32_t)b0;
uint32_t temp;
// All borders have NxN corners
uint32_t *tl = znew_n(uint32_t, size*size);
@ -88,6 +88,11 @@ struct borderset * createBuffer(uint32_t id, int size, enum border_type type, i
size_t side_size = 0;
switch(type) {
case BORDER_INSET:
temp = ll32;
ll32 = hl32;
hl32 = temp;
// Fall throgh intentional
case BORDER_SINGLE: // Single bevel borders have 1x1 sides
top = znew(uint32_t);
left = znew(uint32_t);
@ -113,7 +118,11 @@ struct borderset * createBuffer(uint32_t id, int size, enum border_type type, i
break;
case BORDER_DOUBLE_INSET:
temp = ll32;
ll32 = hl32;
hl32 = temp;
// Fall throgh intentional
case BORDER_DOUBLE:
top = znew_n(uint32_t, size);
left = znew_n(uint32_t, size);
@ -246,32 +255,6 @@ struct borderset * createBuffer(uint32_t id, int size, enum border_type type, i
break;
case BORDER_INSET: // Sunken Single bevel borders have 1x1 sides
top = znew(uint32_t);
left = znew(uint32_t);
right = znew(uint32_t);
bottom = znew(uint32_t);
side_size = 1;
*top = ll32;
*left = ll32;
*right = hl32;
*bottom = hl32;
// Fill with solid
for (int j=0; j<size;j++) {
for (int k=0; k<size;k++) {
tl[PIXEL(j, k, size)] = ll32;
tr[PIXEL(size - 1 - j, k, size)] = (j > k) ? ll32 : hl32;
bl[PIXEL(size - 1 -j, k, size)] = (j > k) ? ll32 : hl32;
br[PIXEL(j, k, size)] = hl32;
}
}
break;
}
assert(side_size > 0);