berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

update luigi.h

This commit is contained in:
nakst 2021-12-14 21:31:05 +00:00
parent d1229cbf26
commit 3ad239c7e7
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
util/luigi.h
View File

@ -666,7 +666,7 @@ void UIElementRefresh(UIElement *element);
void UIElementRepaint(UIElement *element, UIRectangle *region); void UIElementRepaint(UIElement *element, UIRectangle *region);
void UIElementMove(UIElement *element, UIRectangle bounds, bool alwaysLayout); void UIElementMove(UIElement *element, UIRectangle bounds, bool alwaysLayout);
int UIElementMessage(UIElement *element, UIMessage message, int di, void *dp); int UIElementMessage(UIElement *element, UIMessage message, int di, void *dp);
void UIElementChangeParent(UIElement *element, UIElement *newParent, bool insertAtStart); void UIElementChangeParent(UIElement *element, UIElement *newParent, UIElement *insertBefore); // Set insertBefore to null to insert at the end.
UIElement *UIParentPush(UIElement *element); UIElement *UIParentPush(UIElement *element);
UIElement *UIParentPop(); UIElement *UIParentPop();
@ -1444,7 +1444,7 @@ int UIElementMessage(UIElement *element, UIMessage message, int di, void *dp) {
} }
} }
void UIElementChangeParent(UIElement *element, UIElement *newParent, bool insertAtStart) { void UIElementChangeParent(UIElement *element, UIElement *newParent, UIElement *insertBefore) {
UIElement **link = &element->parent->children; UIElement **link = &element->parent->children;
while (true) { while (true) {
@ -1456,20 +1456,15 @@ void UIElementChangeParent(UIElement *element, UIElement *newParent, bool insert
} }
} }
if (insertAtStart) { link = &newParent->children;
element->next = newParent->children; element->next = insertBefore;
newParent->children = element;
} else {
link = &newParent->children;
element->next = NULL;
while (true) { while (true) {
if (!(*link)) { if ((*link) == insertBefore) {
*link = element; *link = element;
break; break;
} else { } else {
link = &(*link)->next; link = &(*link)->next;
}
} }
} }
@ -1724,7 +1719,6 @@ void _UIButtonCalculateColors(UIElement *element, uint32_t *color, uint32_t *tex
: *color == ui.theme.selected ? ui.theme.textSelected : ui.theme.text; : *color == ui.theme.selected ? ui.theme.textSelected : ui.theme.text;
} }
int _UIButtonMessage(UIElement *element, UIMessage message, int di, void *dp) { int _UIButtonMessage(UIElement *element, UIMessage message, int di, void *dp) {
UIButton *button = (UIButton *) element; UIButton *button = (UIButton *) element;
bool isMenuItem = element->flags & UI_BUTTON_MENU_ITEM; bool isMenuItem = element->flags & UI_BUTTON_MENU_ITEM;
@ -5331,7 +5325,7 @@ int _UIWindowMessage(UIElement *element, UIMessage message, int di, void *dp) {
if (message == UI_MSG_DESTROY) { if (message == UI_MSG_DESTROY) {
// TODO Non-main windows. // TODO Non-main windows.
element->window = NULL; element->window = NULL;
EsInstanceDestroy(ui.instance); EsInstanceClose(ui.instance);
} }
return _UIWindowMessageCommon(element, message, di, dp); return _UIWindowMessageCommon(element, message, di, dp);