src/ssd: Convert button node descriptors to struct ssd_button

This allows for way easier button hover detection and future
features like toggling rounded corner buttons on maximize.
This commit is contained in:
Consolatis 2022-06-08 19:51:02 +02:00 committed by Johan Malm
parent f1ada7e407
commit ca9226a7a6
8 changed files with 103 additions and 74 deletions

View file

@ -7,6 +7,7 @@ struct view;
struct lab_layer_surface;
struct lab_layer_popup;
struct menuitem;
struct ssd_button;
enum node_descriptor_type {
LAB_NODE_DESC_NODE = 0,
@ -27,6 +28,10 @@ struct node_descriptor {
/**
* node_descriptor_create - create node descriptor for wlr_scene_node user_data
*
* The node_descriptor will be destroyed automatically
* once the scene_node it is attached to is destroyed.
*
* @scene_node: wlr_scene_node to attached node_descriptor to
* @type: node descriptor type
* @data: struct to point to as follows:
@ -34,6 +39,8 @@ struct node_descriptor {
* - LAB_NODE_DESC_XDG_POPUP struct view
* - LAB_NODE_DESC_LAYER_SURFACE struct lab_layer_surface
* - LAB_NODE_DESC_LAYER_POPUP struct lab_layer_popup
* - LAB_NODE_DESC_MENUITEM struct menuitem
* - LAB_NODE_DESC_SSD_BUTTON struct ssd_button
*/
void node_descriptor_create(struct wlr_scene_node *scene_node,
enum node_descriptor_type type, void *data);
@ -65,4 +72,11 @@ struct lab_layer_popup *node_layer_popup_from_node(
struct menuitem *node_menuitem_from_node(
struct wlr_scene_node *wlr_scene_node);
/**
* node_ssd_button_from_node - return ssd_button struct from node
* @wlr_scene_node: wlr_scene_node from which to return data
*/
struct ssd_button *node_ssd_button_from_node(
struct wlr_scene_node *wlr_scene_node);
#endif /* __LABWC_NODE_DESCRIPTOR_H */

View file

@ -54,6 +54,14 @@ struct wl_list;
struct wlr_box;
struct wlr_scene_tree;
struct ssd_button {
struct view *view;
enum ssd_part_type type;
struct wlr_scene_node *hover;
struct wl_listener destroy;
};
struct ssd_sub_tree {
struct wlr_scene_tree *tree;
struct wl_list parts; /* ssd_part::link */
@ -120,7 +128,6 @@ struct ssd_part {
struct ssd_hover_state {
struct view *view;
enum ssd_part_type type;
struct wlr_scene_node *node;
};
@ -132,9 +139,8 @@ void ssd_update_title(struct view *view);
void ssd_update_geometry(struct view *view);
void ssd_reload(struct view *view);
void ssd_destroy(struct view *view);
/* Returns hover overlay node so it can be disabled later on */
struct wlr_scene_node *ssd_button_hover_enable(
struct view *view, enum ssd_part_type type);
void ssd_update_button_hover(struct wlr_scene_node *node,
struct ssd_hover_state *hover_state);
/* Public SSD helpers */
enum ssd_part_type ssd_at(struct view *view, double lx, double ly);