Mercurial > hg > toolkit / file diff

--- a/make/vs/testapp/main.c	Wed Oct 11 19:11:38 2023 +0200
+++ b/make/vs/testapp/main.c	Wed Oct 11 22:59:42 2023 +0200
@@ -228,7 +228,7 @@
             ui_combobox(obj, .list = wdata->list, .onselection= action_listselection_changed, .onactivate= action_onactivate);
             ui_newline(obj);
 
-            ui_tabview(obj, .colspan = 3, .vexpand = true, .hexpand = true, .tabview = UI_TABVIEW_NAVIGATION_TOP2) {
+            ui_tabview(obj, .colspan = 3, .vexpand = true, .hexpand = true, .tabview = UI_TABVIEW_NAVIGATION_SIDE) {
                 ui_tab(obj, "Tab 1") {
                     ui_button(obj, .label = "Tab 1 Button");
                 }
@@ -264,12 +264,16 @@
     ui_init("app1", 0, NULL);
     ui_onstartup(application_startup, NULL);
 
-    ui_menu("File");
-    ui_menuitem("Test", NULL, NULL);
-    ui_submenu("Sub");
-    ui_menuitem("subitem", NULL, NULL);
-    ui_submenu_end();
-    ui_menuitem("Exit", NULL, NULL);
+    ui_menu("File") {
+        ui_menuitem(.label = "Item 1");
+        ui_menuitem(.label = "Item 2");
+        ui_menuseparator();
+        ui_menu("File Sub") {
+            ui_menuitem(.label = "Sub Item");
+        }
+
+        ui_menuitem(.label = "Exit");
+    }
 
     ui_toolbar_item("Test", .label = "Test", .onclick = action_toolbar_button);
     ui_toolbar_toggleitem("Toggle", .label = "Toggle", .onchange = action_toolbar_button);
@@ -277,20 +281,20 @@
     ui_toolbar_toggleitem("Toggle3", .label = "Toggle3", .onchange = action_toolbar_button);
 
     ui_toolbar_menu("Menu", .label = "Menu") {
-        ui_menuitem("TB Test", NULL, NULL);
-        ui_submenu("TB Sub");
-        ui_menuitem("TB subitem", NULL, NULL);
-        ui_submenu_end();
+        
+        ui_menuitem(.label = "x", NULL, NULL);
+        ui_menu("TB Sub") {
+            ui_menuitem("TB subitem", NULL, NULL);
+        }
     }
 
     ui_toolbar_menu(NULL, .label = "Menu") {
         ui_menuitem("Secondary Test", NULL, NULL);
-        ui_submenu("Secondary Sub");
-        ui_menuitem("Secondary subitem", NULL, NULL);
-        ui_submenu_end();
+        ui_menu("Secondary Sub") {
+            ui_menuitem("Secondary subitem", NULL, NULL);
+        }
     }
 
-
     ui_toolbar_add_default("Test");
     ui_toolbar_add_default("Toggle");
     ui_toolbar_add_default("Toggle2");