Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

decor-fancy: remove the 1-px border around tiled decorations

Browse Source 
I want to add some additional hints to the decorator so that
tiled windows can have a border on their exposed side, eg.
a left-tiled window will have a border on the right. Then
the compositor will size them to account for adding that one
pixel border - which is kinda specific to this design, but
I think it'll work out okay. Other decoration themes will
either have to follow suit, or I can have the decorator
advertise how it wants it decoration bounds to work in regards
to a tiled window.
This commit is contained in:
K. Lange 2018-10-10 15:11:24 +09:00
parent fa56c864b1
commit 9703594bf3
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/decor-fancy.c
View File

@ -53,10 +53,10 @@ static int get_bounds_fancy(yutani_window_t * window, struct decor_bounds * boun
bounds->right_width = 6;
} else {
/* TODO: Window type */
bounds->top_height = 28;
bounds->bottom_height = 1;
bounds->left_width = 1;
bounds->right_width = 1;
bounds->top_height = 27;
bounds->bottom_height = 0;
bounds->left_width = 0;
bounds->right_width = 0;
}
bounds->width = bounds->left_width + bounds->right_width;
@ -77,33 +77,31 @@ static void render_decorations_fancy(yutani_window_t * window, gfx_context_t * c
}
}
uint32_t clear_color = ((window->decorator_flags & DECOR_FLAG_TILED) ? rgb(62,62,62) : 0);
for (int j = (int)bounds.top_height; j < height - (int)bounds.bottom_height; ++j) {
for (int i = 0; i < (int)bounds.left_width; ++i) {
GFX(ctx,i,j) = clear_color;
}
for (int i = width - (int)bounds.right_width; i < width; ++i) {
GFX(ctx,i,j) = clear_color;
}
}
for (int j = height - (int)bounds.bottom_height; j < height; ++j) {
for (int i = 0; i < width; ++i) {
GFX(ctx,i,j) = clear_color;
}
}
if (decors_active == DECOR_INACTIVE) decors_active = INACTIVE;
if ((window->decorator_flags & DECOR_FLAG_TILED)) {
draw_sprite(ctx, sprites[decors_active + 0], -5, -5);
for (int i = 0; i < width - 10; ++i) {
draw_sprite(ctx, sprites[decors_active + 1], i + 5, -5);
for (int i = 0; i < width; ++i) {
draw_sprite(ctx, sprites[decors_active + 1], i, -6);
}
draw_sprite(ctx, sprites[decors_active + 2], width - 5, -5);
} else {
uint32_t clear_color = ((window->decorator_flags & DECOR_FLAG_TILED) ? rgb(62,62,62) : 0);
for (int j = (int)bounds.top_height; j < height - (int)bounds.bottom_height; ++j) {
for (int i = 0; i < (int)bounds.left_width; ++i) {
GFX(ctx,i,j) = clear_color;
}
for (int i = width - (int)bounds.right_width; i < width; ++i) {
GFX(ctx,i,j) = clear_color;
}
}
for (int j = height - (int)bounds.bottom_height; j < height; ++j) {
for (int i = 0; i < width; ++i) {
GFX(ctx,i,j) = clear_color;
}
}
draw_sprite(ctx, sprites[decors_active + 0], 0, 0);
for (int i = 0; i < width - (ul_width + ur_width); ++i) {
draw_sprite(ctx, sprites[decors_active + 1], i + ul_width, 0);