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

fixed corner rounding issue

Browse source
This commit is contained in:
Will McKinnon 2023-05-01 17:49:29 -04:00
parent 4254a34e87
commit aed854c1ce
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sway/desktop/render.c
View file

@ -436,15 +436,17 @@ damage_finish:
static void render_surface_iterator(struct sway_output *output, static void render_surface_iterator(struct sway_output *output,
struct sway_view *view, struct wlr_surface *surface, struct sway_view *view, struct wlr_surface *surface,
struct wlr_box *_box, void *_data) { struct wlr_box *_box, void *_data) {
struct render_data *data = _data;
struct wlr_output *wlr_output = output->wlr_output;
pixman_region32_t *output_damage = data->damage;
struct wlr_texture *texture = wlr_surface_get_texture(surface); struct wlr_texture *texture = wlr_surface_get_texture(surface);
if (!texture) { if (!texture) {
return; return;
} }
struct render_data *data = _data;
struct wlr_output *wlr_output = output->wlr_output;
pixman_region32_t *output_damage = data->damage;
enum wl_output_transform transform = wlr_output_transform_invert(surface->current.transform);
struct wlr_box dst_box = *_box; struct wlr_box dst_box = *_box;
scale_box(&dst_box, wlr_output->scale); scale_box(&dst_box, wlr_output->scale);
@ -474,8 +476,7 @@ static void render_surface_iterator(struct sway_output *output,
if (has_alpha) { if (has_alpha) {
struct wlr_box monitor_box = get_monitor_box(wlr_output); struct wlr_box monitor_box = get_monitor_box(wlr_output);
wlr_box_transform(&monitor_box, &monitor_box, wlr_box_transform(&monitor_box, &monitor_box, transform, monitor_box.width, monitor_box.height);
wlr_output_transform_invert(wlr_output->transform), monitor_box.width, monitor_box.height);
struct wlr_fbox blur_src_box = wlr_fbox_from_wlr_box(&monitor_box); struct wlr_fbox blur_src_box = wlr_fbox_from_wlr_box(&monitor_box);
render_blur(should_optimize_blur, output, output_damage, &blur_src_box, &dst_box, &opaque_region, render_blur(should_optimize_blur, output, output_damage, &blur_src_box, &dst_box, &opaque_region,
surface->current.width, surface->current.height, surface->current.scale, surface->current.width, surface->current.height, surface->current.scale,
@ -490,7 +491,6 @@ static void render_surface_iterator(struct sway_output *output,
scale_box(&proj_box, wlr_output->scale); scale_box(&proj_box, wlr_output->scale);
float matrix[9]; float matrix[9];
enum wl_output_transform transform = wlr_output_transform_invert(surface->current.transform);
wlr_matrix_project_box(matrix, &proj_box, transform, 0.0, wlr_output->transform_matrix); wlr_matrix_project_box(matrix, &proj_box, transform, 0.0, wlr_output->transform_matrix);
struct wlr_fbox src_box; struct wlr_fbox src_box;
@ -508,22 +508,22 @@ static void render_surface_iterator(struct sway_output *output,
int corner_radius = deco_data.corner_radius; int corner_radius = deco_data.corner_radius;
if (view) { if (view) {
struct sway_container *con = view->container; struct sway_container *con = view->container;
struct sway_container_state *state = &con->current;
// Only draw shadows on CSD windows if shadows_on_csd is enabled // Only draw shadows on CSD windows if shadows_on_csd is enabled
if (con->current.border == B_CSD && !config->shadows_on_csd_enabled) { if (con->current.border == B_CSD && !config->shadows_on_csd_enabled) {
return; return;
} }
corner_radius = (con->corner_radius + state->border_thickness) * wlr_output->scale; // Account for titlebars and borders
struct sway_container_state state = con->current;
// Account for titlebars corner_radius += state.border_thickness;
shadow_box.x = floor(state->x) - output->lx; shadow_box.x = floor(state.x) - output->lx;
shadow_box.y = floor(state->y) - output->ly; shadow_box.y = floor(state.y) - output->ly;
shadow_box.width = state->width; shadow_box.width = state.width;
shadow_box.height = state->height; shadow_box.height = state.height;
scale_box(&shadow_box, wlr_output->scale); scale_box(&shadow_box, wlr_output->scale);
} }
corner_radius *= wlr_output->scale;
render_box_shadow(output, output_damage, &shadow_box, config->shadow_color, render_box_shadow(output, output_damage, &shadow_box, config->shadow_color,
config->shadow_blur_sigma, corner_radius); config->shadow_blur_sigma, corner_radius);
} }