application/window.c

changeset 108
77254bd6dccb
parent 106
3a64316b3672
child 109
c3dfcb8f0be7
--- a/application/window.c	Sat Apr 05 17:57:04 2025 +0200
+++ b/application/window.c	Sun Jul 20 22:04:39 2025 +0200
@@ -81,13 +81,13 @@
 
     // navigation bar
 
-    ui_hbox(obj, .fill = UI_OFF, .margin = 8, .spacing = 8) {
-        ui_hbox(obj, .fill = UI_OFF, .style_class="linked") {
+    ui_hbox(obj, .margin = 8, .spacing = 8) {
+        ui_hbox(obj, .style_class="linked") {
             ui_button(obj, .icon = UI_ICON_GO_BACK, .onclick = action_go_back);
             ui_button(obj, .icon = UI_ICON_GO_FORWARD, .onclick = action_go_forward);
         }
 
-        ui_path_textfield(obj, .fill = UI_ON, .getpathelm = dav_get_pathelm, .onactivate = action_path_selected, .varname = "path");
+        ui_path_textfield(obj, .fill = TRUE, .getpathelm = dav_get_pathelm, .onactivate = action_path_selected, .varname = "path");
         ui_progressspinner(obj, .value = wdata->progress);
     }
 
@@ -97,7 +97,7 @@
     model->columnsize[2] = 150;
     model->getvalue = (ui_getvaluefunc) window_resource_table_getvalue;
     ui_table(obj,
-            .fill = UI_ON,
+            .fill = TRUE,
             .model = model,
             .onselection = action_list_selection,
             .onactivate = action_list_activate,
@@ -110,7 +110,7 @@
 
     // status bar
 
-    ui_hbox(obj, .fill = UI_OFF) {
+    ui_hbox0(obj) {
         ui_label(obj, .label = "");
     }
 
@@ -199,10 +199,10 @@
     ui_attach_document(win->ctx, doc);
     ui_context_closefunc(win->ctx, resourceviewer_close, doc);
     
-    ui_tabview(win, .tabview = UI_TABVIEW_INVISIBLE, .varname = "tabview") {
+    ui_tabview(win, .tabview = UI_TABVIEW_INVISIBLE, .varname = "tabview", .fill = TRUE) {
         /* loading / message tab */
         ui_tab(win, NULL) {
-            ui_hbox(win, .margin = 16, .spacing = 10, .fill = UI_OFF) {
+            ui_hbox(win, .margin = 16, .spacing = 10, .fill = TRUE) {
                 ui_progressspinner(win, .varname = "loading");
                 ui_label(win, .varname = "message");
             }
@@ -210,7 +210,7 @@
         
         /* preview tab */
         ui_tab(win, NULL) {
-            ui_tabview0(win) {
+            ui_tabview(win, .fill = TRUE) {
                 if(type == DAV_RESOURCE_VIEW_TEXT) {
                     ui_tab(win, "Content") {
                         ui_textarea(win, .varname = "text", .onchange = action_resourceviewer_text_modified);
@@ -220,12 +220,13 @@
                         ui_imageviewer(win,
                                 .varname = "image",
                                 .scrollarea = TRUE,
-                                .useradjustable = TRUE);
+                                .useradjustable = TRUE,
+                                .fill = TRUE);
                     }
                 }
                 
                 ui_tab(win, "Info") {
-                    ui_grid(win, .margin = 16, .columnspacing = 30, .rowspacing = 6) {
+                    ui_grid(win, .margin = 16, .columnspacing = 30, .rowspacing = 6, .fill = TRUE) {
                         ui_llabel(win, .label = "URL");
                         ui_llabel(win, .varname = "info_url");
                         ui_newline(win);
@@ -255,8 +256,8 @@
                 ui_tab(win, "Properties") {
                     UiModel* model = ui_model(win->ctx, UI_STRING, "Namespace", UI_STRING, "Name", UI_STRING, "Value", -1);
                     model->getvalue = (ui_getvaluefunc) resourceviewer_proplist_getvalue;
-                    ui_table(win, .fill = UI_ON, .model = model, .varname = "properties", .onselection = action_resourceviewer_property_select, .onactivate = action_resourceviewer_property_activate);
-                    ui_hbox(win, .fill = UI_OFF, .margin = 4, .spacing = 4) {
+                    ui_table(win, .fill = TRUE, .model = model, .varname = "properties", .onselection = action_resourceviewer_property_select, .onactivate = action_resourceviewer_property_activate);
+                    ui_hbox(win, .margin = 4, .spacing = 4) {
                         ui_button(win, .label = "Add", .onclick = action_resourceviewer_property_add);
                         ui_button(win, .label = "Edit", .onclick = action_resourceviewer_property_edit, .groups = UI_GROUPS(RESOURCEVIEWER_STATE_PROP_SELECTED));
                         ui_button(win, .label = "Remove", .onclick = action_resourceviewer_property_remove, .groups = UI_GROUPS(RESOURCEVIEWER_STATE_PROP_SELECTED));
@@ -322,7 +323,7 @@
     wdata->password = ui_string_new(obj->ctx, NULL);
     obj->window = wdata;
     
-    ui_grid(obj, .margin = 20, .columnspacing = 12, .rowspacing = 12) {
+    ui_grid(obj, .margin = 20, .columnspacing = 12, .rowspacing = 12, .fill = TRUE) {
         cxmutstr heading = cx_asprintf("Authentication required for: %s", auth->sn->base_url);
         ui_llabel(obj, .label = heading.ptr, .colspan = 2);
         free(heading.ptr);

mercurial