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

Init is_toplevel_surface properly

Browse source
This commit is contained in:
Erik Reider 2023-04-22 00:07:57 +02:00
parent fe2ab9c1da
commit d4e8038082
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/desktop/output.c
View file

@ -205,7 +205,6 @@ void output_layer_for_each_toplevel_surface(struct sway_output *output,
data->deco_data.blur = effects->blur; data->deco_data.blur = effects->blur;
data->deco_data.corner_radius = data->deco_data.corner_radius =
effects->corner_radius? config->corner_radius: 0; effects->corner_radius? config->corner_radius: 0;
data->is_toplevel_surface = true;
} }
output_surface_for_each_surface(output, wlr_layer_surface_v1->surface, output_surface_for_each_surface(output, wlr_layer_surface_v1->surface,

7
sway/desktop/render.c
View file

@ -405,6 +405,7 @@ static void render_layer_toplevel(struct sway_output *output,
pixman_region32_t *damage, struct wl_list *layer_surfaces) { pixman_region32_t *damage, struct wl_list *layer_surfaces) {
struct fx_render_data data = { struct fx_render_data data = {
.damage = damage, .damage = damage,
.is_toplevel_surface = true,
.deco_data = get_undecorated_decoration_data(), .deco_data = get_undecorated_decoration_data(),
}; };
output_layer_for_each_toplevel_surface(output, layer_surfaces, output_layer_for_each_toplevel_surface(output, layer_surfaces,
@ -415,6 +416,7 @@ static void render_layer_popups(struct sway_output *output,
pixman_region32_t *damage, struct wl_list *layer_surfaces) { pixman_region32_t *damage, struct wl_list *layer_surfaces) {
struct fx_render_data data = { struct fx_render_data data = {
.damage = damage, .damage = damage,
.is_toplevel_surface = false,
.deco_data = get_undecorated_decoration_data(), .deco_data = get_undecorated_decoration_data(),
}; };
output_layer_for_each_popup_surface(output, layer_surfaces, output_layer_for_each_popup_surface(output, layer_surfaces,
@ -426,6 +428,7 @@ static void render_unmanaged(struct sway_output *output,
pixman_region32_t *damage, struct wl_list *unmanaged) { pixman_region32_t *damage, struct wl_list *unmanaged) {
struct fx_render_data data = { struct fx_render_data data = {
.damage = damage, .damage = damage,
.is_toplevel_surface = false,
.deco_data = get_undecorated_decoration_data(), .deco_data = get_undecorated_decoration_data(),
}; };
output_unmanaged_for_each_surface(output, unmanaged, output_unmanaged_for_each_surface(output, unmanaged,
@ -437,6 +440,7 @@ static void render_drag_icons(struct sway_output *output,
pixman_region32_t *damage, struct wl_list *drag_icons) { pixman_region32_t *damage, struct wl_list *drag_icons) {
struct fx_render_data data = { struct fx_render_data data = {
.damage = damage, .damage = damage,
.is_toplevel_surface = false,
.deco_data = get_undecorated_decoration_data(), .deco_data = get_undecorated_decoration_data(),
}; };
output_drag_icons_for_each_surface(output, drag_icons, output_drag_icons_for_each_surface(output, drag_icons,
@ -649,6 +653,7 @@ static void render_view_toplevels(struct sway_view *view, struct sway_output *ou
pixman_region32_t *damage, struct decoration_data deco_data) { pixman_region32_t *damage, struct decoration_data deco_data) {
struct fx_render_data data = { struct fx_render_data data = {
.damage = damage, .damage = damage,
.is_toplevel_surface = false,
.deco_data = deco_data, .deco_data = deco_data,
}; };
// Clip the window to its view size, ignoring CSD // Clip the window to its view size, ignoring CSD
@ -673,6 +678,7 @@ static void render_view_popups(struct sway_view *view, struct sway_output *outpu
pixman_region32_t *damage, struct decoration_data deco_data) { pixman_region32_t *damage, struct decoration_data deco_data) {
struct fx_render_data data = { struct fx_render_data data = {
.damage = damage, .damage = damage,
.is_toplevel_surface = false,
.deco_data = deco_data, .deco_data = deco_data,
}; };
output_view_for_each_popup_surface(output, view, output_view_for_each_popup_surface(output, view,
@ -1830,6 +1836,7 @@ void output_render(struct sway_output *output, struct timespec *when,
if (server.session_lock.lock != NULL) { if (server.session_lock.lock != NULL) {
struct fx_render_data data = { struct fx_render_data data = {
.damage = damage, .damage = damage,
.is_toplevel_surface = false,
.deco_data = get_undecorated_decoration_data(), .deco_data = get_undecorated_decoration_data(),
}; };