Mercurial > hg > idav / file diff

--- a/ui/common/toolbar.c	Sun Dec 07 20:00:33 2025 +0100
+++ b/ui/common/toolbar.c	Sat Dec 13 15:58:58 2025 +0100
@@ -57,15 +57,15 @@
     newargs.tooltip = nl_strdup(args->tooltip);
     newargs.onclick = args->onclick;
     newargs.onclickdata = args->onclickdata;
-    newargs.groups = uic_copy_groups(args->groups, ngroups);
-    newargs.visibility_states = uic_copy_groups(args->visibility_states, nvstates);
+    newargs.states = uic_copy_states(args->states, ngroups);
+    newargs.visibility_states = uic_copy_states(args->visibility_states, nvstates);
     return newargs;
 }
 
 void ui_toolbar_item_create(const char* name, UiToolbarItemArgs *args) {
     UiToolbarItem* item = malloc(sizeof(UiToolbarItem));
     item->item.type = UI_TOOLBAR_ITEM;
-    item->args = itemargs_copy(args, &item->ngroups, &item->nvstates);
+    item->args = itemargs_copy(args, &item->nstates, &item->nvstates);
     cxMapPut(toolbar_items, name, item);
 }
 
@@ -78,15 +78,15 @@
     newargs.varname = nl_strdup(args->varname);
     newargs.onchange = args->onchange;
     newargs.onchangedata = args->onchangedata;
-    newargs.groups = uic_copy_groups(args->groups, ngroups);
-    newargs.visibility_states = uic_copy_groups(args->visibility_states, nvstates);
+    newargs.states = uic_copy_states(args->states, ngroups);
+    newargs.visibility_states = uic_copy_states(args->visibility_states, nvstates);
     return newargs;
 }
 
 void ui_toolbar_toggleitem_create(const char* name, UiToolbarToggleItemArgs *args) {
     UiToolbarToggleItem* item = malloc(sizeof(UiToolbarToggleItem));
     item->item.type = UI_TOOLBAR_TOGGLEITEM;
-    item->args = toggleitemargs_copy(args, &item->ngroups, &item->nvstates);
+    item->args = toggleitemargs_copy(args, &item->nstates, &item->nvstates);
     cxMapPut(toolbar_items, name, item);
 }
 
@@ -95,7 +95,7 @@
     newargs.label = nl_strdup(args->label);
     newargs.icon = nl_strdup(args->icon);
     newargs.tooltip = nl_strdup(args->tooltip);
-    newargs.visibility_states = uic_copy_groups(args->visibility_states, nvstates);
+    newargs.visibility_states = uic_copy_states(args->visibility_states, nvstates);
     return newargs;
 }