mirror of
https://github.com/labwc/labwc.git
synced 2026-04-12 08:21:13 -04:00
Fix for icon not initially showing when alt icon not set
This commit is contained in:
parent
2aa4b55de2
commit
9eb123cbd5
2 changed files with 3 additions and 3 deletions
|
|
@ -101,7 +101,7 @@ struct ssd_hover_state {
|
||||||
struct view *view;
|
struct view *view;
|
||||||
struct wlr_scene_node *node;
|
struct wlr_scene_node *node;
|
||||||
struct wlr_scene_node *old_node;
|
struct wlr_scene_node *old_node;
|
||||||
enum view_axis maximized;
|
int maximized;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_buffer;
|
struct wlr_buffer;
|
||||||
|
|
|
||||||
|
|
@ -394,7 +394,7 @@ ssd_update_button_hover(struct wlr_scene_node *node,
|
||||||
disable_old_hover:
|
disable_old_hover:
|
||||||
if (hover_state->node) {
|
if (hover_state->node) {
|
||||||
wlr_scene_node_set_enabled(hover_state->node, false);
|
wlr_scene_node_set_enabled(hover_state->node, false);
|
||||||
if (hover_state->maximized == hover_state->view->maximized)
|
if (hover_state->maximized == (int) hover_state->view->maximized || hover_state->maximized == -1)
|
||||||
wlr_scene_node_set_enabled (hover_state->old_node, true);
|
wlr_scene_node_set_enabled (hover_state->old_node, true);
|
||||||
hover_state->view = NULL;
|
hover_state->view = NULL;
|
||||||
hover_state->node = NULL;
|
hover_state->node = NULL;
|
||||||
|
|
@ -406,7 +406,7 @@ disable_old_hover:
|
||||||
hover_state->view = button->view;
|
hover_state->view = button->view;
|
||||||
hover_state->node = maximized ? button->althover : button->hover;
|
hover_state->node = maximized ? button->althover : button->hover;
|
||||||
hover_state->old_node = maximized ? button->alticon : button->icon;
|
hover_state->old_node = maximized ? button->alticon : button->icon;
|
||||||
hover_state->maximized = button->view->maximized;
|
hover_state->maximized = button->alticon ? (int) button->view->maximized : -1;
|
||||||
wlr_scene_node_set_enabled (maximized ? button->alticon : button->icon, false);
|
wlr_scene_node_set_enabled (maximized ? button->alticon : button->icon, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue