mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-08 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

desktop: don't use LAB_NODE_LAYER_SUBSURFACE node type

Browse source 
Instead, set ctx.type = LAB_NODE_LAYER_SURFACE for both layer-surfaces
and layer-subsurfaces.

This patch preserves the existing behaviors:
- Pressing a subsurface of an on-demand layer-surface gives pointer
  focus to the subsurface, but gives keyboard focus to the parent
  layer-surface (related: a5fcbfaf).
- Pressing a subsurface of a layer-surface doesn't close a popup
  (related: a89bcc3c).
This commit is contained in:
tokyo4j 2025-09-09 02:51:33 +09:00 • committed by Hiroaki Yamamoto
parent 574b20fbff
commit 3d670b772d
6 changed files with 23 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/common/meson.build
View file

@ -17,7 +17,6 @@ labwc_sources += files(
'parse-double.c',
'scene-helpers.c',
'set.c',
'surface-helpers.c',
'spawn.c',
'string-helpers.c',
'xml.c',

27
src/common/surface-helpers.c
View file

@ -1,27 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "common/surface-helpers.h"
#include <wlr/types/wlr_layer_shell_v1.h>
#include <wlr/types/wlr_subcompositor.h>
#include <wlr/util/log.h>
struct wlr_layer_surface_v1 *
subsurface_parent_layer(struct wlr_surface *wlr_surface)
{
struct wlr_subsurface *subsurface =
wlr_subsurface_try_from_wlr_surface(wlr_surface);
if (!subsurface) {
return NULL;
}
struct wlr_surface *parent = subsurface->parent;
if (!parent) {
wlr_log(WLR_DEBUG, "subsurface %p has no parent", subsurface);
return NULL;
}
struct wlr_layer_surface_v1 *wlr_layer_surface =
wlr_layer_surface_v1_try_from_wlr_surface(parent);
if (wlr_layer_surface) {
return wlr_layer_surface;
}
/* Recurse in case there are nested sub-surfaces */
return subsurface_parent_layer(parent);
}