mirror of
https://github.com/labwc/labwc.git
synced 2026-02-15 22:05:25 -05:00
ssd: unify struct ssd_part with struct node_descriptor
struct ssd_part and struct node_descriptor seem to have essentially the same purpose: tag a wlr_scene_node with some extra data indicating what we're using it for. Also, as with enum ssd_part_type (now lab_node_type), ssd_part is used for several types of nodes that are not part of SSD. So instead of the current chaining (node_descriptor -> ssd_part), let's flatten/unify the two structs. In detail: - First, merge node_descriptor_type into lab_node_type. - Add a separate view pointer in node_descriptor, since in the case of SSD buttons we need separate view and button data pointers. - Rename ssd_part_button to simply ssd_button. It no longer contains an ssd_part as base. - Add node_try_ssd_button_from_node() which replaces node_ssd_part_from_node() + button_try_from_ssd_part(). - Factor out ssd_button_free() to be called in node descriptor destroy. - Finally, get_cursor_context() needs a little reorganization to handle the unified structs. Overall, this simplifies the code a bit, and in my opinion makes it easier to understand. No functional change intended.
This commit is contained in:
parent
ba426e2271
commit
f129571779
22 changed files with 169 additions and 239 deletions
|
|
@ -46,12 +46,23 @@ enum lab_node_type {
|
|||
LAB_NODE_CLIENT,
|
||||
LAB_NODE_FRAME,
|
||||
LAB_NODE_ROOT,
|
||||
LAB_NODE_MENU,
|
||||
LAB_NODE_MENUITEM,
|
||||
LAB_NODE_OSD,
|
||||
LAB_NODE_LAYER_SURFACE,
|
||||
LAB_NODE_LAYER_SUBSURFACE,
|
||||
LAB_NODE_UNMANAGED,
|
||||
LAB_NODE_ALL,
|
||||
|
||||
/* translated to LAB_NODE_CLIENT by get_cursor_context() */
|
||||
LAB_NODE_VIEW,
|
||||
LAB_NODE_XDG_POPUP,
|
||||
LAB_NODE_LAYER_POPUP,
|
||||
LAB_NODE_SESSION_LOCK_SURFACE,
|
||||
LAB_NODE_IME_POPUP,
|
||||
|
||||
/* never returned by get_cursor_context() */
|
||||
LAB_NODE_TREE,
|
||||
LAB_NODE_SCALED_BUFFER,
|
||||
};
|
||||
|
||||
enum lab_node_type node_type_parse(const char *context);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue