mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-12 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix coding standard violations

Browse source
This commit is contained in:
Simon Long 2023-12-04 15:13:03 +00:00
parent 142977aa1c
commit 143d9b7fa4
3 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/ssd-internal.h
View file

@ -129,8 +129,8 @@ add_alt_icon(struct wl_list *part_list, enum ssd_part_type type,
struct ssd_part *add_scene_button_corner(
struct wl_list *part_list, enum ssd_part_type type,
enum ssd_part_type corner_type, struct wlr_scene_tree *parent,
struct wlr_buffer *corner_buffer, struct wlr_buffer *icon_buffer, struct wlr_buffer *hover_buffer,
int x, struct view *view);
struct wlr_buffer *corner_buffer, struct wlr_buffer *icon_buffer,
struct wlr_buffer *hover_buffer, int x, struct view *view);
/* SSD internal helpers */
struct ssd_part *ssd_get_part(

4
src/ssd/ssd_part.c
View file

@ -194,8 +194,8 @@ add_alt_icon(struct wl_list *part_list, enum ssd_part_type type,
struct wlr_buffer *icon_buffer, struct wlr_buffer *hover_buffer)
{
struct ssd_part *part = ssd_get_part(part_list, type);
struct ssd_button *button = node_ssd_button_from_node (part->node);
struct wlr_scene_tree *parent = lab_scene_tree_from_node (part->node);
struct ssd_button *button = node_ssd_button_from_node(part->node);
struct wlr_scene_tree *parent = lab_scene_tree_from_node(part->node);
/* Alternate icon */
struct wlr_box icon_geo = get_scale_box(icon_buffer,

34
src/ssd/ssd_titlebar.c
View file

@ -184,13 +184,17 @@ ssd_titlebar_update(struct ssd *ssd)
if (is_direct_child(part->node, subtree)) {
wlr_scene_node_set_position(part->node,
width - SSD_BUTTON_WIDTH * 2, 0);
struct ssd_button *button = node_ssd_button_from_node(part->node);
if (button->alticon)
{
wlr_scene_node_set_enabled (button->icon, !maximized);
wlr_scene_node_set_enabled (button->alticon, maximized);
wlr_scene_node_set_enabled (button->hover, false);
wlr_scene_node_set_enabled (button->althover, false);
struct ssd_button *button =
node_ssd_button_from_node(part->node);
if (button->alticon) {
wlr_scene_node_set_enabled(button->icon,
!maximized);
wlr_scene_node_set_enabled(button->alticon,
maximized);
wlr_scene_node_set_enabled(button->hover,
false);
wlr_scene_node_set_enabled(button->althover,
false);
}
}
continue;
@ -394,20 +398,24 @@ ssd_update_button_hover(struct wlr_scene_node *node,
disable_old_hover:
if (hover_state->node) {
wlr_scene_node_set_enabled(hover_state->node, false);
if (hover_state->maximized == (int) hover_state->view->maximized || hover_state->maximized == -1)
wlr_scene_node_set_enabled (hover_state->old_node, true);
if (hover_state->maximized == (int)hover_state->view->maximized
|| hover_state->maximized == -1) {
wlr_scene_node_set_enabled(hover_state->old_node, true);
}
hover_state->view = NULL;
hover_state->node = NULL;
}
if (button) {
bool maximized = button->view->maximized;
if (maximized && !button->alticon) maximized = false;
wlr_scene_node_set_enabled (maximized ? button->althover : button->hover, true);
if (maximized && !button->alticon) {
maximized = false;
}
wlr_scene_node_set_enabled(maximized ? button->althover : button->hover, true);
hover_state->view = button->view;
hover_state->node = maximized ? button->althover : button->hover;
hover_state->old_node = maximized ? button->alticon : button->icon;
hover_state->maximized = button->alticon ? (int) button->view->maximized : -1;
wlr_scene_node_set_enabled (maximized ? button->alticon : button->icon, false);
hover_state->maximized = button->alticon ? (int)button->view->maximized : -1;
wlr_scene_node_set_enabled(maximized ? button->alticon : button->icon, false);
}
}