alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: rounded_corners support smart_gaps (#62)

Browse source
This commit is contained in:
William McKinnon 2022-11-23 23:59:47 -05:00 committed by GitHub
parent 6951b8e493
commit cf5a188aa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
sway/desktop/render.c
View file

@ -554,8 +554,8 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
* The left side is: 1px border, 2px padding, title * The left side is: 1px border, 2px padding, title
*/ */
static void render_titlebar(struct sway_output *output, static void render_titlebar(struct sway_output *output,
pixman_region32_t *output_damage, struct sway_container *con, pixman_region32_t *output_damage, struct sway_container *con, int x, int y,
int x, int y, int width, struct border_colors *colors, int width, struct border_colors *colors, float alpha, int corner_radius,
struct wlr_texture *title_texture, struct wlr_texture *marks_texture) { struct wlr_texture *title_texture, struct wlr_texture *marks_texture) {
struct wlr_box box; struct wlr_box box;
float color[4]; float color[4];
@ -564,7 +564,6 @@ static void render_titlebar(struct sway_output *output,
double output_y = output->ly; double output_y = output->ly;
int titlebar_border_thickness = config->titlebar_border_thickness; int titlebar_border_thickness = config->titlebar_border_thickness;
enum alignment title_align = config->title_align; enum alignment title_align = config->title_align;
int corner_radius = con->corner_radius;
// titlebar padding should account for corner radius // titlebar padding should account for corner radius
int titlebar_h_padding = corner_radius > config->titlebar_h_padding ? int titlebar_h_padding = corner_radius > config->titlebar_h_padding ?
@ -574,7 +573,7 @@ static void render_titlebar(struct sway_output *output,
// Single pixel bar above title // Single pixel bar above title
memcpy(&color, colors->border, sizeof(float) * 4); memcpy(&color, colors->border, sizeof(float) * 4);
premultiply_alpha(color, con->alpha); premultiply_alpha(color, alpha);
box.x = corner_radius ? x + corner_radius : x + titlebar_border_thickness; box.x = corner_radius ? x + corner_radius : x + titlebar_border_thickness;
box.y = y; box.y = y;
box.width = corner_radius ? box.width = corner_radius ?
@ -641,7 +640,7 @@ static void render_titlebar(struct sway_output *output,
// title marks textures should have no eyecandy // title marks textures should have no eyecandy
struct decoration_data deco_data = get_undecorated_decoration_data(); struct decoration_data deco_data = get_undecorated_decoration_data();
deco_data.alpha = con->alpha; deco_data.alpha = alpha;
// Marks // Marks
int ob_marks_x = 0; // output-buffer-local int ob_marks_x = 0; // output-buffer-local
@ -684,7 +683,7 @@ static void render_titlebar(struct sway_output *output,
// Padding above // Padding above
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
premultiply_alpha(color, con->alpha); premultiply_alpha(color, alpha);
box.x = texture_box.x + round(output_x * output_scale); box.x = texture_box.x + round(output_x * output_scale);
box.y = round((y + titlebar_border_thickness) * output_scale); box.y = round((y + titlebar_border_thickness) * output_scale);
box.width = texture_box.width; box.width = texture_box.width;
@ -760,7 +759,7 @@ static void render_titlebar(struct sway_output *output,
// Padding above // Padding above
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
premultiply_alpha(color, con->alpha); premultiply_alpha(color, alpha);
box.x = texture_box.x + round(output_x * output_scale); box.x = texture_box.x + round(output_x * output_scale);
box.y = round((y + titlebar_border_thickness) * output_scale); box.y = round((y + titlebar_border_thickness) * output_scale);
box.width = texture_box.width; box.width = texture_box.width;
@ -950,17 +949,19 @@ static void render_containers_linear(struct sway_output *output,
bool has_titlebar = state->border == B_NORMAL; bool has_titlebar = state->border == B_NORMAL;
struct decoration_data deco_data = { struct decoration_data deco_data = {
.alpha = child->alpha, .alpha = child->alpha,
.corner_radius = child->corner_radius, // no corner radius if smart gaps are on and only visible view
.corner_radius = config->smart_gaps == SMART_GAPS_ON &&
view_ancestor_is_only_visible(view) ? 0 : child->corner_radius,
.saturation = child->saturation, .saturation = child->saturation,
.has_titlebar = has_titlebar, .has_titlebar = has_titlebar,
}; };
render_view(output, damage, child, colors, deco_data); render_view(output, damage, child, colors, deco_data);
if (has_titlebar) { if (has_titlebar) {
render_titlebar(output, damage, child, floor(state->x), render_titlebar(output, damage, child, floor(state->x), floor(state->y),
floor(state->y), state->width, colors, state->width, colors, deco_data.alpha, deco_data.corner_radius,
title_texture, marks_texture); title_texture, marks_texture);
} else if (state->border == B_PIXEL) { } else if (state->border == B_PIXEL) {
render_top_border(output, damage, state, colors, child->alpha, child->corner_radius); render_top_border(output, damage, state, colors, deco_data.alpha, deco_data.corner_radius);
} }
} else { } else {
render_container(output, damage, child, render_container(output, damage, child,
@ -1029,8 +1030,8 @@ static void render_containers_tabbed(struct sway_output *output,
tab_width = parent->box.width - tab_width * i; tab_width = parent->box.width - tab_width * i;
} }
render_titlebar(output, damage, child, x, parent->box.y, tab_width, render_titlebar(output, damage, child, x, parent->box.y, tab_width, colors,
colors, title_texture, marks_texture); child->alpha, child->corner_radius, title_texture, marks_texture);
if (child == current) { if (child == current) {
current_colors = colors; current_colors = colors;
@ -1098,8 +1099,8 @@ static void render_containers_stacked(struct sway_output *output,
} }
int y = parent->box.y + titlebar_height * i; int y = parent->box.y + titlebar_height * i;
render_titlebar(output, damage, child, parent->box.x, y, render_titlebar(output, damage, child, parent->box.x, y, parent->box.width,
parent->box.width, colors, title_texture, marks_texture); colors, child->alpha, child->corner_radius, title_texture, marks_texture);
if (child == current) { if (child == current) {
current_colors = colors; current_colors = colors;
@ -1212,11 +1213,11 @@ static void render_floating_container(struct sway_output *soutput,
}; };
render_view(soutput, damage, con, colors, deco_data); render_view(soutput, damage, con, colors, deco_data);
if (has_titlebar) { if (has_titlebar) {
render_titlebar(soutput, damage, con, floor(state->x), render_titlebar(soutput, damage, con, floor(state->x), floor(state->y),
floor(state->y), state->width, colors, state->width, colors, deco_data.alpha, deco_data.corner_radius,
title_texture, marks_texture); title_texture, marks_texture);
} else if (state->border == B_PIXEL) { } else if (state->border == B_PIXEL) {
render_top_border(soutput, damage, state, colors, con->alpha, con->corner_radius); render_top_border(soutput, damage, state, colors, deco_data.alpha, deco_data.corner_radius);
} }
} else { } else {
render_container(soutput, damage, con, state->focused); render_container(soutput, damage, con, state->focused);