Mercurial > hg > toolkit / changeset

--- a/make/vs/testapp/main.c	Wed Oct 30 11:07:52 2024 +0100
+++ b/make/vs/testapp/main.c	Wed Oct 30 12:23:52 2024 +0100
@@ -34,6 +34,317 @@
 
 #include <ui/ui.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <ui/ui.h>
+
+
+typedef struct {
+    UiString *str1;
+    UiString *str2;
+    UiString *path;
+    UiText *text;
+    UiDouble *progress;
+    UiList *list;
+    UiList *menulist;
+    UiInteger *radio;
+    UiInteger *tabview;
+    UiGeneric *image;
+} MyDocument;
+
+MyDocument *doc1;
+MyDocument *doc2;
+
+UIWIDGET tabview;
+
+static UiCondVar *cond;
+static int thr_end = 0;
+static int thr_started = 0;
+
+int threadfunc(void *data) {
+    printf("thr wait for data...\n");
+    ui_condvar_wait(cond);
+    printf("thr data received: {%s} [%d]\n", cond->data, cond->intdata);
+    ui_condvar_destroy(cond);
+    cond = NULL;
+
+    return 0;
+}
+
+void action_start_thread(UiEvent *event, void *data) {
+    if(!thr_started) {
+        cond = ui_condvar_create();
+        ui_job(event->obj, threadfunc, NULL, NULL, NULL);
+        thr_started = 1;
+    }
+}
+
+void action_notify_thread(UiEvent *event, void *data) {
+    if(!thr_end) {
+        ui_condvar_signal(cond, "hello thread", 123);
+        thr_end = 1;
+    }
+}
+
+void action_menu(UiEvent *event, void *userdata) {
+
+}
+
+void action_file_selected(UiEvent *event, void *userdata) {
+    UiFileList *files = event->eventdata;
+    MyDocument *doc = event->document;
+    printf("files: %d\n", (int)files->nfiles);
+    if(files->nfiles > 0) {
+        printf("selected file: %s\n", files->files[0]);
+        ui_image_load_file(doc->image, files->files[0]);
+    }
+}
+
+void action_button(UiEvent *event, void *userdata) {
+    ui_openfiledialog(event->obj, UI_FILEDIALOG_SELECT_SINGLE, action_file_selected, NULL);
+}
+
+void action_switch(UiEvent *event, void *userdata) {
+
+}
+
+void action_toolbar_button(UiEvent *event, void *userdata) {
+    printf("toolbar button\n");
+
+    ui_dialog(event->obj, .title = "Dialog Title", .content = "Content Label", .button1_label = "btn1", .button2_label = "btn2", .input = TRUE, .closebutton_label = "Cancel");
+}
+
+void action_dialog_button(UiEvent *event, void *userdata) {
+    ui_close(event->obj);
+}
+
+void action_toolbar_dialog(UiEvent *event, void *userdata) {
+
+    UiObject *dialog = ui_dialog_window(event->obj, .title  = "Dialog Window", .lbutton1 = "Cancel 1", .lbutton2 = "Btn2", .rbutton3 = "Btn3", .rbutton4 = "Login 4", .onclick = action_dialog_button, .default_button = 4, .show_closebutton = UI_OFF);
+
+    ui_vbox(dialog, .margin = 10, .spacing = 10) {
+        ui_label(dialog, .label = "Enter password:");
+        ui_passwordfield(dialog, .varname = "password");
+    }
+
+    ui_show(dialog);
+}
+
+void action_toolbar_newwindow(UiEvent *event, void *userdata) {
+    UiObject *obj = ui_simple_window("New Window", NULL);
+
+    ui_headerbar0(obj) {
+        ui_headerbar_start(obj) {
+            ui_button(obj, .label = "Open");
+        }
+        ui_headerbar_end(obj) {
+            ui_button(obj, .label = "Test");
+        }
+    }
+
+    ui_textarea(obj, .varname="text");
+
+    ui_show(obj);
+}
+
+MyDocument* create_doc(void) {
+    MyDocument *doc = ui_document_new(sizeof(MyDocument));
+    UiContext *docctx = ui_document_context(doc);
+    doc->str1 = ui_string_new(docctx, "str1");
+    doc->str1 = ui_string_new(docctx, "str2");
+    doc->path = ui_string_new(docctx, "path");
+    doc->progress = ui_double_new(docctx, "progress");
+    doc->list = ui_list_new(docctx, "list");
+    ui_list_append(doc->list, "test1");
+    ui_list_append(doc->list, "test2");
+    ui_list_append(doc->list, "test3");
+    doc->radio = ui_int_new(docctx, "radio");
+    doc->tabview = ui_int_new(docctx, "tabview");
+    doc->image = ui_generic_new(docctx, "image");
+    //doc->text = ui_text_new(docctx, "text");
+    return doc;
+}
+
+UiIcon *icon = NULL;
+
+static void* list_getvalue(void *elm, int col) {
+    /*
+    if(col == 0) {
+    if(!icon) {
+    icon = ui_icon("folder", 24);
+    }
+    return icon;
+    }
+    */
+
+    char *str = elm;
+    return col == 0 ? str : "x";
+}
+
+static UiList *menu_list;
+int new_item_count = 0;
+
+void action_add_menu_item(UiEvent *event, void *userdata) {
+    char str[64];
+    snprintf(str, 64, "new item %d", new_item_count++);
+
+    ui_list_append(menu_list, strdup(str));
+    ui_list_notify(menu_list);
+}
+
+void action_menu_list(UiEvent *event, void *userdata) {
+    printf("menu list item: %d\n", event->intval);
+}
+
+static int tab_x = 0;
+void action_tab2_button(UiEvent *event, void *userdata) {
+    MyDocument *doc = event->document;
+    printf("current page: %d\n", (int)ui_get(doc->tabview));
+    ui_set(doc->tabview, 0);
+}
+
+
+void action_group1(UiEvent *event, void *userdata) {
+    UiContext *ctx = event->obj->ctx;
+    if(userdata) {
+        ui_unset_group(ctx, 1);
+    } else {
+        ui_set_group(ctx, 1);
+    }
+}
+
+void action_group2(UiEvent *event, void *userdata) {
+    UiContext *ctx = event->obj->ctx;
+    if(userdata) {
+        ui_unset_group(ctx, 2);
+    } else {
+        ui_set_group(ctx, 2);
+    }
+}
+
+void application_startup(UiEvent *event, void *data) {
+    // global list
+    UiContext *global = ui_global_context();
+    menu_list = ui_list_new(global, "menulist");
+    ui_list_append(menu_list, "menu list item 1");
+    ui_list_append(menu_list, "menu list item 2");
+    ui_list_append(menu_list, "menu list item 3");
+
+
+
+    UiObject *obj = ui_window("Test", NULL);
+
+    MyDocument *doc = create_doc();
+    ui_attach_document(obj->ctx, doc);
+
+    ui_tabview(obj, .spacing=10, .margin=10, .tabview = UI_TABVIEW_NAVIGATION_SIDE, .varname="tabview") {
+        ui_tab(obj, "Tab 1") {
+            ui_vbox(obj, .fill = UI_OFF, .margin = 15, .spacing = 15) {
+                ui_button(obj, .label = "Test Button", .icon = "application-x-generic", .onclick = action_button);
+                ui_togglebutton(obj, .label = "Toggle");
+                ui_checkbox(obj, .label = "My Checkbox");
+            }
+            ui_grid(obj, .fill = UI_OFF, .columnspacing = 15, .rowspacing = 15, .margin = 15) {
+                ui_button(obj, .label = "Activate Group 1", .hexpand = TRUE, .onclick = action_group1);
+                ui_button(obj, .label = "Disable Group 1", .onclick = action_group1, .onclickdata = "disable");
+                ui_newline(obj);
+                ui_button(obj, .label = "Activate Group 2", .hexpand = TRUE, .onclick = action_group2);
+                ui_button(obj, .label = "Disable Group 2", .onclick = action_group2, .onclickdata = "disable");
+                ui_newline(obj);
+
+                ui_button(obj, .label = "Groups 1,2", .colspan = 2, .groups = UI_GROUPS(1, 2));
+                ui_newline(obj);
+
+                ui_label(obj, .label = "Label Col 1", .align = UI_ALIGN_LEFT);
+                ui_label(obj, .label = "Label Col 2", .style = UI_LABEL_STYLE_TITLE, .align = UI_ALIGN_RIGHT);
+                ui_newline(obj);
+
+                //ui_spinner(obj, .step = 5);
+                //ui_newline(obj);
+
+                ui_progressbar(obj, .colspan = 2, .varname = "progress");
+                ui_set(doc->progress, 0.75);
+                ui_newline(obj);
+
+                ui_textfield(obj, .value = doc->str1);
+                ui_newline(obj);
+
+                //ui_button(obj, .label="Test");
+                ui_path_textfield(obj, .varname = "path");
+                ui_set(doc->path, "/test/path/longdirectoryname/123");
+                ui_newline(obj);
+
+                //UiModel *model = ui_model(obj->ctx, UI_ICON_TEXT, "Col 1", UI_STRING, "Col 2", -1);
+                //model->getvalue = list_getvalue;
+                ui_combobox(obj, .hexpand = true, .vexpand = false, .colspan = 2, .varname = "list", .getvalue = list_getvalue);
+                ui_newline(obj);
+
+                ui_hbox0(obj) {
+                    ui_radiobutton(obj, .label = "Radio 1", .varname = "radio");
+                    ui_radiobutton(obj, .label = "Radio 2", .varname = "radio");
+                    ui_radiobutton(obj, .label = "Radio 3", .varname = "radio");
+                }
+            }
+        }
+        ui_tab(obj, "Tab 2") {
+            ui_button(obj, .label = "Button 1 Start Thread", .onclick=action_start_thread);
+            ui_button(obj, .label = "Button 2 Notify Thread", .onclick=action_notify_thread);
+            ui_button(obj, .label = "Button 3", .onclick=action_tab2_button);
+            ui_button(obj, .label = "Button 4", .onclick=action_tab2_button);
+            ui_button(obj, .label = "Button 5", .onclick=action_tab2_button);
+            ui_button(obj, .label = "Button 6", .onclick=action_tab2_button);
+        }
+        ui_tab(obj, "Tab 3") {
+            UiTabViewArgs args = {0};
+            UI_CTN(obj, tabview=ui_tabview_create(obj, args)) {
+                UiObject *tab1 = ui_tabview_add(tabview, "Sub 1", -1);
+                ui_button(tab1, .label = "Button 1");
+
+
+                UiObject *tab2 = ui_tabview_add(tabview, "Sub 2", -1);
+                ui_button(tab2, .label = "Button 2");
+            }
+        }
+        ui_tab(obj, "Tab 4") {
+            ui_textarea(obj, .varname = "text");
+        }
+        ui_tab(obj, "Tab 5") {
+            ui_button(obj, .label = "Test Button", .icon = "application-x-generic", .onclick = action_button);
+            ui_imageviewer(obj, .varname = "image", .style_class = "imageviewer");
+        }
+
+        ui_tab(obj, "Tab 6") {
+            ui_scrolledwindow(obj, .fill = UI_ON) {
+                ui_expander(obj, .label = "Expander", .margin = 10, .spacing = 10) {
+                    ui_label(obj, .label = "Test");
+                    ui_button(obj, .label = "Button");
+                }
+
+                ui_frame(obj, .label = "Frame", .margin = 10, .spacing = 10) {
+                    ui_label(obj, .label = "Title", .style = UI_LABEL_STYLE_TITLE);
+                    ui_label(obj, .label = "Sub-Title", .style = UI_LABEL_STYLE_SUBTITLE);
+                    ui_label(obj, .label = "Dim Label", .style = UI_LABEL_STYLE_DIM);
+                    ui_label(obj, .label = "No Style");
+                }
+
+                for(int i=0;i<100;i++) {
+                    char labelstr[32];
+                    snprintf(labelstr, 32, "button %d", i);
+                    ui_button(obj, .label = labelstr);
+                }
+            }
+        }
+    }
+
+    /*
+
+    */
+
+    ui_show(obj);
+}
+
+/*
 typedef struct WindowData {
     UiInteger* check;
     UiInteger* toggle;
@@ -368,9 +679,62 @@
     ui_show(obj);
 }
 
+*/
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, int nCmdShow)
 { 
+    ui_init("app1", NULL, 0);
+    ui_onstartup(application_startup, NULL);
+
+    // menu
+    ui_menu("File") {
+        ui_menuitem(.label = "Test");
+    }
+
+    ui_toolbar_item("Test", .label = "Test", .onclick = action_toolbar_button);
+    ui_toolbar_item("Test2", .label = "New Window", .onclick = action_toolbar_newwindow);
+    ui_toolbar_item("Test3", .label = "Dialog", .onclick = action_toolbar_dialog);
+    ui_toolbar_item("Test4", .label = "Test 4", .onclick = action_toolbar_button);
+    ui_toolbar_item("Test5", .label = "Test 5", .onclick = action_toolbar_button);
+    ui_toolbar_item("Test6", .label = "Test 6", .onclick = action_toolbar_button);
+    ui_toolbar_toggleitem("Toggle", .label = "Toggle", .onchange = action_toolbar_button);
+    ui_toolbar_menu("Menu", .label = "Menu") {
+        ui_menuitem("Secondary Test", .onclick = action_toolbar_button, NULL);
+        ui_menu("Secondary Sub") {
+            ui_menuitem("Secondary subitem", NULL, NULL);
+        }
+        ui_menuseparator();
+        ui_menu_itemlist(.varname = "menulist", .onselect=action_menu_list);
+        ui_menuseparator();
+        ui_menuitem("last", .onclick = action_add_menu_item);
+    }
+
+    ui_toolbar_appmenu() {
+        ui_menuitem("New");
+        ui_menuitem("Open");
+        ui_menuitem("Save");
+
+        ui_menuseparator();
+
+        ui_menuitem("Close");
+    }
+
+    ui_toolbar_add_default("Test", UI_TOOLBAR_LEFT);
+    ui_toolbar_add_default("Test6", UI_TOOLBAR_LEFT);
+    ui_toolbar_add_default("Toggle", UI_TOOLBAR_LEFT);
+    ui_toolbar_add_default("Menu", UI_TOOLBAR_LEFT);
+
+    ui_toolbar_add_default("Test2", UI_TOOLBAR_CENTER);
+    ui_toolbar_add_default("Test3", UI_TOOLBAR_CENTER);
+
+    ui_toolbar_add_default("Test4", UI_TOOLBAR_RIGHT);
+    ui_toolbar_add_default("Test5", UI_TOOLBAR_RIGHT);
+
+    ui_main();
+
+    return (EXIT_SUCCESS);
+    
+    /*
     ui_init("app1", 0, NULL);
     ui_onstartup(application_startup, NULL);
     
@@ -419,4 +783,5 @@
     ui_main();
 
     return (EXIT_SUCCESS);
+    */
 }

--- a/make/vs/testapp/testapp.vcxproj	Wed Oct 30 11:07:52 2024 +0100
+++ b/make/vs/testapp/testapp.vcxproj	Wed Oct 30 12:23:52 2024 +0100
@@ -111,8 +111,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;UI_WINUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>false</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;UI_WINUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>C:\Users\Olaf\Projekte\toolkit\ui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard_C>stdc17</LanguageStandard_C>

--- a/ui/ui/image.h	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/ui/image.h	Wed Oct 30 12:23:52 2024 +0100
@@ -56,7 +56,7 @@
     
 UIEXPORT UIWIDGET ui_imageviewer_create(UiObject *obj, UiImageViewerArgs args);
 
-int ui_image_load_file(UiGeneric *obj, const char *path);
+UIEXPORT int ui_image_load_file(UiGeneric *obj, const char *path);
 
 #ifdef __cplusplus
 }

--- a/ui/ui/text.h	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/ui/text.h	Wed Oct 30 12:23:52 2024 +0100
@@ -110,12 +110,12 @@
 
 #define ui_textarea(obj, ...) ui_textarea_create(obj, (UiTextAreaArgs) { __VA_ARGS__ })
 
-UIWIDGET ui_textarea_create(UiObject *obj, UiTextAreaArgs args);
+UIEXPORT UIWIDGET ui_textarea_create(UiObject *obj, UiTextAreaArgs args);
 
-UIWIDGET ui_textarea_gettextwidget(UIWIDGET textarea);
+UIEXPORT UIWIDGET ui_textarea_gettextwidget(UIWIDGET textarea);
 
-void ui_text_undo(UiText *value);
-void ui_text_redo(UiText *value);
+UIEXPORT void ui_text_undo(UiText *value);
+UIEXPORT void ui_text_redo(UiText *value);
 
 #define ui_textfield(obj, ...) ui_textfield_create(obj, (UiTextFieldArgs) { __VA_ARGS__ })
 #define ui_frameless_textfield(obj, ...) ui_frameless_field_create(obj, (UiTextFieldArgs) { __VA_ARGS__ })

--- a/ui/winui/button.cpp	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/winui/button.cpp	Wed Oct 30 12:23:52 2024 +0100
@@ -56,12 +56,17 @@
 		icon = NULL;
 	}
 
-	if (label && icon) {
+	IconElement icon_elm = { nullptr };
+	if (icon) {
+		icon_elm = ui_get_icon(icon);
+	}
+
+	if (label && icon_elm) {
 		StackPanel panel = StackPanel();
 		panel.Orientation(Orientation::Horizontal);
 		panel.Spacing(5);
 		
-		panel.Children().Append(ui_get_icon(icon));
+		panel.Children().Append(icon_elm);
 
 		wchar_t* wlabel = str2wstr(label, nullptr);
 		TextBlock label = TextBlock();
@@ -76,7 +81,7 @@
 		button.Content(box_value(wlabel));
 		free(wlabel);
 	}
-	else if (icon) {
+	else if (icon_elm) {
 		button.Content(ui_get_icon(icon));
 	}
 }

--- a/ui/winui/container.cpp	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/winui/container.cpp	Wed Oct 30 12:23:52 2024 +0100
@@ -469,7 +469,7 @@
 	this->rowspacing = args.rowspacing;
 }
 
-UiObject* UiPivotTabView::AddTab(const char* label) {
+UiObject* UiPivotTabView::AddTab(const char* label, int index) {
 	TextBlock text = TextBlock();
 	wchar_t* wlabel = str2wstr(label, nullptr);
 	winrt::hstring hstr(wlabel);
@@ -487,6 +487,10 @@
 	return create_subcontainer_obj(current, subcontainer, this->subcontainer, margin, spacing, columnspacing, rowspacing);
 }
 
+void UiPivotTabView::Remove(int index) {
+	pivot.Items().RemoveAt(index);
+}
+
 FrameworkElement UiPivotTabView::GetFrameworkElement() {
 	return pivot;
 }
@@ -507,7 +511,7 @@
 	this->rowspacing = args.rowspacing;
 }
 
-UiObject* UiMainTabView::AddTab(const char* label) {
+UiObject* UiMainTabView::AddTab(const char* label, int index) {
 	TextBlock text = TextBlock();
 	wchar_t* wlabel = str2wstr(label, nullptr);
 	winrt::hstring hstr(wlabel);
@@ -527,6 +531,10 @@
 	return create_subcontainer_obj(current, subcontainer, this->subcontainer, margin, spacing, columnspacing, rowspacing);
 }
 
+void UiMainTabView::Remove(int index) {
+	this->tabview.TabItems().RemoveAt(index);
+}
+
 FrameworkElement UiMainTabView::GetFrameworkElement() {
 	return tabview;
 }
@@ -557,7 +565,7 @@
 	navigationview.SelectionChanged({ this, &UiNavigationTabView::SelectionChanged });
 }
 
-UiObject* UiNavigationTabView::AddTab(const char* label) {
+UiObject* UiNavigationTabView::AddTab(const char* label, int index1) {
 	TextBlock text = TextBlock();
 	wchar_t* wlabel = str2wstr(label, nullptr);
 	winrt::hstring hstr(wlabel);
@@ -581,6 +589,11 @@
 	return create_subcontainer_obj(current, subcontainer, this->subcontainer, margin, spacing, columnspacing, rowspacing);
 }
 
+void UiNavigationTabView::Remove(int index) {
+	navigationview.MenuItems().RemoveAt(index);
+	pages.erase(pages.begin() + index);
+}
+
 FrameworkElement UiNavigationTabView::GetFrameworkElement() {
 	return navigationview;
 }
@@ -656,6 +669,53 @@
 	uic_obj_add(current, newobj);
 }
 
+UIEXPORT void ui_tabview_select(UIWIDGET tabview, int tab) {
+	UiTabView* t = (UiTabView*)tabview->data1;
+	t->Remove(tab);
+}
+
+UIEXPORT void ui_tabview_remove(UIWIDGET tabview, int tab) {
+	UiTabView* t = (UiTabView*)tabview->data1;
+	t->Remove(tab);
+}
+
+UIEXPORT UiObject* ui_tabview_add(UIWIDGET tabview, const char *name, int tab_index) {
+	UiTabView* t = (UiTabView*)tabview->data1;
+	UiObject* newobj = t->AddTab(name, tab_index);
+	return newobj;
+}
+
+
+
+// --------------------- UI Headerbar ---------------------
+
+// TODO: replace placeholder implementation
+
+UIEXPORT UIWIDGET ui_headerbar_create(UiObject *obj, UiHeaderbarArgs args) {
+	UiContainerArgs boxargs = { };
+	boxargs.fill = UI_OFF;
+	return ui_hbox_create(obj, boxargs);
+}
+
+UIEXPORT void ui_headerbar_start_create(UiObject *obj) {
+	UiContainerArgs boxargs = { };
+	boxargs.fill = UI_OFF;
+	ui_hbox_create(obj, boxargs);
+}
+
+UIEXPORT void ui_headerbar_center_create(UiObject *obj) {
+	UiContainerArgs boxargs = { };
+	boxargs.fill = UI_OFF;
+	ui_hbox_create(obj, boxargs);
+}
+
+UIEXPORT void ui_headerbar_end_create(UiObject *obj) {
+	UiContainerArgs boxargs = { };
+	boxargs.fill = UI_OFF;
+	ui_hbox_create(obj, boxargs);
+}
+
+
 /*
  * -------------------- Layout Functions --------------------
  *

--- a/ui/winui/container.h	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/winui/container.h	Wed Oct 30 12:23:52 2024 +0100
@@ -120,7 +120,8 @@
     int columnspacing;
     int rowspacing;
 
-    virtual UiObject* AddTab(const char* label) = 0;
+    virtual UiObject* AddTab(const char* label, int index = -1) = 0;
+    virtual void Remove(int index) = 0;
 
     virtual FrameworkElement GetFrameworkElement() = 0;
 };
@@ -138,7 +139,8 @@
 
     UiPivotTabView(UiObject *obj, Pivot pivot, UiTabViewArgs args);
 
-    UiObject* AddTab(const char* label);
+    UiObject* AddTab(const char* label, int index = -1);
+    void Remove(int index);
     FrameworkElement GetFrameworkElement();
 };
 
@@ -147,7 +149,8 @@
 
     UiMainTabView(UiObject* obj, TabView tabview, UiTabViewArgs args);
 
-    UiObject* AddTab(const char* label);
+    UiObject* AddTab(const char* label, int index = -1);
+    void Remove(int index);
     FrameworkElement GetFrameworkElement();
 };
 
@@ -158,7 +161,8 @@
 
     UiNavigationTabView(UiObject* obj, NavigationView navigationview, UiTabViewArgs args, UiTabViewType type);
 
-    UiObject* AddTab(const char* label);
+    UiObject* AddTab(const char* label, int index = -1);
+    void Remove(int index);
     FrameworkElement GetFrameworkElement();
 
     void SelectionChanged(NavigationView const& sender, NavigationViewSelectionChangedEventArgs const& args);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/winui/image.cpp	Wed Oct 30 12:23:52 2024 +0100
@@ -0,0 +1,51 @@
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright 2024 Olaf Wintermann. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+*   1. Redistributions of source code must retain the above copyright
+*      notice, this list of conditions and the following disclaimer.
+*
+*   2. Redistributions in binary form must reproduce the above copyright
+*      notice, this list of conditions and the following disclaimer in the
+*      documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "pch.h"
+
+#include "image.h"
+
+#include "toolkit.h"
+#include "container.h"
+#include "../common/object.h"
+#include "../common/context.h"
+
+using namespace winrt;
+using namespace Microsoft::UI::Xaml;
+using namespace Microsoft::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Interop;
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Microsoft::UI::Xaml::Controls::Primitives;
+
+UIEXPORT UIWIDGET ui_imageviewer_create(UiObject *obj, UiImageViewerArgs args) {
+    return NULL;
+}
+
+UIEXPORT int ui_image_load_file(UiGeneric *obj, const char *path) {
+    return 0;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/winui/image.h	Wed Oct 30 12:23:52 2024 +0100
@@ -0,0 +1,33 @@
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright 2024 Olaf Wintermann. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+*   1. Redistributions of source code must retain the above copyright
+*      notice, this list of conditions and the following disclaimer.
+*
+*   2. Redistributions in binary form must reproduce the above copyright
+*      notice, this list of conditions and the following disclaimer in the
+*      documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#pragma once
+
+#include "../ui/toolkit.h"
+#include "../ui/image.h"
+

--- a/ui/winui/text.cpp	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/winui/text.cpp	Wed Oct 30 12:23:52 2024 +0100
@@ -51,6 +51,93 @@
 using namespace winrt::Microsoft::UI::Xaml::Controls::Primitives;
 using namespace winrt::Windows::UI::Xaml::Input;
 
+
+UIEXPORT UIWIDGET ui_textarea_create(UiObject *obj, UiTextAreaArgs args) {
+    UiObject* current = uic_current_obj(obj);
+
+    // create textarea and toolkit wrapper
+    RichEditBox textarea = RichEditBox();
+    UIElement elm = textarea;
+    UiWidget* widget = new UiWidget(elm);
+    ui_context_add_widget_destructor(current->ctx, widget);
+
+    UiVar* var = uic_widget_var(obj->ctx, current->ctx, args.value, args.varname, UI_VAR_TEXT);
+    if (var) {
+        UiText* value = (UiText*)var->value;
+        value->obj = widget;
+        value->undomgr = NULL;
+        value->set = ui_textarea_set;
+        value->get = ui_textarea_get;
+        value->getsubstr = ui_textarea_getsubstr;
+        value->insert = ui_textarea_insert;
+        value->setposition = ui_textarea_setposition;
+        value->position = ui_textarea_position;
+        value->selection = ui_textarea_selection;
+        value->length = ui_textarea_length;
+        value->remove = ui_textarea_remove;
+    }
+
+    // add textarea to current container
+    UI_APPLY_LAYOUT1(current, args);
+
+    current->container->Add(textarea, true);
+
+    return widget;
+}
+
+UIEXPORT UIWIDGET ui_textarea_gettextwidget(UIWIDGET textarea) {
+    return textarea;
+}
+
+UIEXPORT void ui_text_undo(UiText *value) {
+
+}
+
+UIEXPORT void ui_text_redo(UiText *value) {
+
+}
+
+
+
+extern "C" char* ui_textarea_get(UiText *text) {
+    return NULL;
+}
+
+extern "C" void  ui_textarea_set(UiText *text, const char *newvalue) {
+
+}
+
+extern "C" char* ui_textarea_getsubstr(UiText *text, int begin, int end) {
+    return NULL;
+}
+
+extern "C" void  ui_textarea_insert(UiText *text, int pos, char *str) {
+
+}
+
+extern "C" void  ui_textarea_setposition(UiText *text, int pos) {
+
+}
+
+extern "C" int   ui_textarea_position(UiText *text) {
+    return 0;
+}
+
+extern "C" void  ui_textarea_selection(UiText *text, int *begin, int *end) {
+
+}
+
+extern "C" int   ui_textarea_length(UiText *text) {
+    return 0;
+}
+
+extern "C" void  ui_textarea_remove(UiText *text, int begin, int end) {
+
+}
+
+
+
+
 UIWIDGET ui_textfield_create(UiObject* obj, UiTextFieldArgs args) {
     UiObject* current = uic_current_obj(obj);
 
@@ -71,7 +158,7 @@
         // TODO:
     }
     
-    // add button to current container
+    // add textfield to current container
     UI_APPLY_LAYOUT1(current, args);
 
     current->container->Add(textfield, false);
@@ -103,7 +190,7 @@
         // TODO:
     }
 
-    // add button to current container
+    // add textfield to current container
     UI_APPLY_LAYOUT1(current, args);
 
     current->container->Add(textfield, false);

--- a/ui/winui/text.h	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/winui/text.h	Wed Oct 30 12:23:52 2024 +0100
@@ -63,6 +63,16 @@
 char* ui_wstring_get(UiString* str, std::wstring& value);
 std::wstring ui_wstring_set(UiString* str, const char* value);
 
+extern "C" char* ui_textarea_get(UiText *text);
+extern "C" void  ui_textarea_set(UiText *text, const char *newvalue);
+extern "C" char* ui_textarea_getsubstr(UiText*, int, int);
+extern "C" void  ui_textarea_insert(UiText*, int, char*);
+extern "C" void  ui_textarea_setposition(UiText*,int);
+extern "C" int   ui_textarea_position(UiText*);
+extern "C" void  ui_textarea_selection(UiText*, int*, int*);
+extern "C" int   ui_textarea_length(UiText*);
+extern "C" void  ui_textarea_remove(UiText*, int, int);
+
 extern "C" char* ui_textfield_get(UiString *str);
 extern "C" void  ui_textfield_set(UiString *str, const char *newvalue);
 

--- a/ui/winui/window.cpp	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/winui/window.cpp	Wed Oct 30 12:23:52 2024 +0100
@@ -199,6 +199,10 @@
 	return obj;
 }
 
+UIEXPORT UiObject* ui_dialog_window_create(UiObject *parent, UiDialogWindowArgs args) {
+	return NULL;
+}
+
 void ui_window_size(UiObject *obj, int width, int height) {
 	UIWINDOW win = obj->wobj;
 	if (win) {

--- a/ui/winui/winui.vcxproj	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/winui/winui.vcxproj	Wed Oct 30 12:23:52 2024 +0100
@@ -137,6 +137,7 @@
     <ClInclude Include="container.h" />
     <ClInclude Include="dnd.h" />
     <ClInclude Include="icons.h" />
+    <ClInclude Include="image.h" />
     <ClInclude Include="label.h" />
     <ClInclude Include="list.h" />
     <ClInclude Include="pch.h" />
@@ -165,6 +166,7 @@
     <ClCompile Include="container.cpp" />
     <ClCompile Include="dnd.cpp" />
     <ClCompile Include="icons.cpp" />
+    <ClCompile Include="image.cpp" />
     <ClCompile Include="label.cpp" />
     <ClCompile Include="list.cpp" />
     <ClCompile Include="pch.cpp">

--- a/ui/winui/winui.vcxproj.filters	Wed Oct 30 11:07:52 2024 +0100
+++ b/ui/winui/winui.vcxproj.filters	Wed Oct 30 12:23:52 2024 +0100
@@ -28,6 +28,7 @@
     <ClCompile Include="label.cpp" />
     <ClCompile Include="dnd.cpp" />
     <ClCompile Include="condvar.cpp" />
+    <ClCompile Include="image.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -97,6 +98,7 @@
     <ClInclude Include="label.h" />
     <ClInclude Include="dnd.h" />
     <ClInclude Include="condvar.h" />
+    <ClInclude Include="image.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Assets\Wide310x150Logo.scale-200.png">