diff options
| -rw-r--r-- | apps/window.c | 2 | ||||
| -rw-r--r-- | libgui/gui.c | 29 | ||||
| -rw-r--r-- | libgui/inc/gui.h | 2 |
3 files changed, 24 insertions, 9 deletions
diff --git a/apps/window.c b/apps/window.c index 86e4467..a69b6db 100644 --- a/apps/window.c +++ b/apps/window.c @@ -25,7 +25,7 @@ int main() button->on_click = on_click; - gui_event_loop(container); + gui_event_loop(root); return 0; } diff --git a/libgui/gui.c b/libgui/gui.c index 922a11a..3a10c02 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -40,7 +40,6 @@ static struct window *new_window(const char *title, int x, int y, u32 width, u32 return win; } -// TODO: Fix relative position in container static void merge_elements(struct element *container) { if (!container || !container->childs || !container->childs->head) @@ -63,17 +62,33 @@ static struct element *element_at(struct element *container, int x, int y) if (!container || !container->childs || !container->childs->head) return NULL; - struct element *ret = NULL; struct node *iterator = container->childs->head; while (iterator != NULL) { struct context *ctx = ((struct element *)iterator->data)->ctx; - if (ctx != container->ctx && ctx->flags & WF_RELATIVE && x >= ctx->x && - x <= ctx->x + (int)ctx->width && y >= ctx->y && y <= ctx->y + (int)ctx->height) - ret = iterator->data; + + int relative_x, relative_y; + if (container->type == GUI_TYPE_ROOT) { + relative_x = ctx->x; + relative_y = ctx->y; + } else { + relative_x = ctx->x + container->ctx->x; + relative_y = ctx->y + container->ctx->y; + } + + if (ctx != container->ctx && ctx->flags & WF_RELATIVE && x >= relative_x && + x <= relative_x + (int)ctx->width && y >= relative_y && + y <= relative_y + (int)ctx->height) { + struct element *recursive = NULL; + if ((recursive = element_at(iterator->data, x, y))) + return recursive; + else + return iterator->data; + } + iterator = iterator->next; } - return ret; + return NULL; } void gui_sync_button(struct element *elem) @@ -192,7 +207,7 @@ struct element *gui_init(const char *title, u32 width, u32 height) gfx_fill(win->ctx, COLOR_BG); struct element *container = malloc(sizeof(*container)); - container->type = GUI_TYPE_CONTAINER; + container->type = GUI_TYPE_ROOT; container->window_id = win->id; container->ctx = win->ctx; container->childs = list_new(); diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h index 14f2e4e..b79db3a 100644 --- a/libgui/inc/gui.h +++ b/libgui/inc/gui.h @@ -12,7 +12,7 @@ // TODO: Improve event types (maybe as struct header) enum window_event_type { GUI_KEYBOARD = GFX_MAX + 1, GUI_MOUSE, GUI_MAX }; -enum element_type { GUI_TYPE_CONTAINER, GUI_TYPE_BUTTON, GUI_TYPE_TEXTBOX }; +enum element_type { GUI_TYPE_ROOT, GUI_TYPE_CONTAINER, GUI_TYPE_BUTTON, GUI_TYPE_TEXTBOX }; enum container_flags { SPLIT }; |