Mercurial > hg > toolkit / file diff

--- a/ui/ui/display.h	Tue Oct 17 21:00:48 2023 +0200
+++ b/ui/ui/display.h	Tue Oct 17 21:50:48 2023 +0200
@@ -54,7 +54,6 @@
     UiBool vexpand;
     int colspan;
     int rowspan;
-    int width;
 
     const char* label;
     UiAlignment align;
@@ -62,6 +61,20 @@
     const char* varname;
 } UiLabelArgs;
 
+typedef struct UiProgressbarArgs {
+    UiTri fill;
+    UiBool hexpand;
+    UiBool vexpand;
+    int colspan;
+    int rowspan;
+    int width;
+
+    double min;
+    double max;
+    UiDouble* value;
+    const char* varname;
+} UiProgressbarArgs;
+
 /* label widgets */
 
 #define ui_label(obj, ...) ui_label_create(obj, (UiLabelArgs) { __VA_ARGS__ })
@@ -73,16 +86,14 @@
 UIEXPORT UIWIDGET ui_llabel_create(UiObject* obj, UiLabelArgs args);
 UIEXPORT UIWIDGET ui_rlabel_create(UiObject* obj, UiLabelArgs args);
 
-UIWIDGET ui_label_deprecated(UiObject *obj, char *label);
-UIWIDGET ui_llabel_deprecated(UiObject *obj, char *label);
-UIWIDGET ui_rlabel_deprecated(UiObject *obj, char *label);
-
 UIWIDGET ui_space(UiObject *obj);
 UIWIDGET ui_separator(UiObject *obj);
 
 /* progress bar */
-UIWIDGET ui_progressbar(UiObject *obj, UiDouble *value);
-UIWIDGET ui_progressbar_nv(UiObject *obj, char *varname);
+
+#define ui_progressbar(obj, ...) ui_progressbar_create(obj, (UiProgressbarArgs) { __VA_ARGS__ } )
+
+UIEXPORT UIWIDGET ui_progressbar_create(UiObject *obj, UiProgressbarArgs args);
 
 
 #ifdef __cplusplus