alec/erythros
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Media/Themes/Umami/Theme: Separate focus/hover logic from repaint

Browse source 
We shouldn't be doing this in the Theme routines to begin with, but
that's another issue altogether.
This commit is contained in:
Alec Murphy 2025-04-09 09:07:50 -04:00
parent 940e7b230c
commit d242f5c395
1 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Media/Themes/Umami/Theme.HC
View file

@ -1245,16 +1245,22 @@ U0 @umami_vert_scrollbar_repaint(Window* win, I64 event,
widget->change = TRUE; widget->change = TRUE;
} }
U0 @umami_widgets_repaint(Window* win, I64 event, I64 origin_x, I64 origin_y) U0 @umami_set_focused_and_hovered_widget(Window* win, I64 event)
{ {
I64 title_bar_height = 0;
if (@gui_window_flag_is_set(win, WIN_FLAGS_TITLE_BAR)) {
title_bar_height = 17;
}
I64 x, y;
I64 origin_x = 4;
I64 origin_y = 4;
if (title_bar_height)
origin_y = 7 + title_bar_height;
@window_widgets_list* widgets_list; @window_widgets_list* widgets_list;
Widget* widget; Widget* widget;
Context2D* ctx; Bool widget_is_hovered = FALSE;
Bool widget_is_hovered;
I64 x, y;
F64 ttf_point_to_size;
no_warn ctx;
no_warn ttf_point_to_size;
if (event == CPZ_MSG_WIN_LEFT_BTN_DOWN) if (event == CPZ_MSG_WIN_LEFT_BTN_DOWN)
win->focused_widget = NULL; win->focused_widget = NULL;
@ -1320,6 +1326,18 @@ U0 @umami_widgets_repaint(Window* win, I64 event, I64 origin_x, I64 origin_y)
} }
win->mouse_down_widget = NULL; win->mouse_down_widget = NULL;
} }
}
U0 @umami_widgets_repaint(Window* win, I64 event, I64 origin_x, I64 origin_y)
{
@window_widgets_list* widgets_list;
Widget* widget;
Context2D* ctx;
// Bool widget_is_hovered;
I64 x, y;
F64 ttf_point_to_size;
no_warn ctx;
no_warn ttf_point_to_size;
widgets_list = win->widget; widgets_list = win->widget;
while (widgets_list) { while (widgets_list) {
@ -1671,4 +1689,4 @@ U0 @umami_pointer_wait_anim_init()
} }
@umami_pointer_wait_anim_init; @umami_pointer_wait_anim_init;
Compositor.theme.pointer.wait = Animation2D.NewFromFrames(umami_pointer_wait_frames, 18, 50); Compositor.theme.pointer.wait = Animation2D.NewFromFrames(umami_pointer_wait_frames, 18, 50);