De-macroify mu_number

ashn-dot-dev · Dec 27, 2023 · 1ff6b5a · 1ff6b5a
1 parent af328bd
commit 1ff6b5a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/microui.c b/microui.c
@@ -973,6 +973,12 @@ mu_slider_ex(mu_Context* ctx, mu_Real *value, mu_Real low, mu_Real high, mu_Real
     return res;
 }
 
+int
+mu_number(mu_Context* ctx, mu_Real *value, mu_Real step)
+{
+    return mu_number_ex(ctx, value, step, MU_SLIDER_FMT, MU_OPT_ALIGNCENTER)
+}
+
 int
 mu_number_ex(mu_Context* ctx, mu_Real *value, mu_Real step, char const* fmt, int opt)
 {

diff --git a/microui.h b/microui.h
@@ -267,7 +267,6 @@ void mu_draw_control_text(mu_Context* ctx, char const* str, mu_Rect rect, int co
 int mu_mouse_over(mu_Context* ctx, mu_Rect rect);
 void mu_update_control(mu_Context* ctx, mu_Id id, mu_Rect rect, int opt);
 
-#define mu_number(ctx, value, step)       mu_number_ex(ctx, value, step, MU_SLIDER_FMT, MU_OPT_ALIGNCENTER)
 #define mu_header(ctx, label)             mu_header_ex(ctx, label, 0)
 #define mu_begin_treenode(ctx, label)     mu_begin_treenode_ex(ctx, label, 0)
 #define mu_begin_window(ctx, title, rect) mu_begin_window_ex(ctx, title, rect, 0)
@@ -283,6 +282,7 @@ int mu_textbox_ex(mu_Context* ctx, char *buf, int bufsz, int opt);
 int mu_textbox_raw(mu_Context* ctx, char *buf, int bufsz, mu_Id id, mu_Rect r, int opt);
 int mu_slider(mu_Context* ctx, mu_Real *value, mu_Real lo, mu_Real hi);
 int mu_slider_ex(mu_Context* ctx, mu_Real *value, mu_Real low, mu_Real high, mu_Real step, char const* fmt, int opt);
+int mu_number(mu_Context* ctx, mu_Real *value, mu_Real step);
 int mu_number_ex(mu_Context* ctx, mu_Real *value, mu_Real step, char const* fmt, int opt);
 int mu_header_ex(mu_Context* ctx, char const* label, int opt);
 int mu_begin_treenode_ex(mu_Context* ctx, char const* label, int opt);

diff --git a/microui.sunder b/microui.sunder
@@ -232,7 +232,6 @@ extern func mu_draw_control_text(ctx: *mu_Context, str: *char, rect: mu_Rect, co
 extern func mu_mouse_over(ctx: *mu_Context, rect: mu_Rect) sint;
 extern func mu_update_control(ctx: *mu_Context, id: mu_Id, rect: mu_Rect, opt: sint) void;
 
-func mu_number(ctx: *mu_Context, value: *mu_Real, step: mu_Real) sint { return mu_number_ex(ctx, value, step, MU_SLIDER_FMT, MU_OPT_ALIGNCENTER); }
 func mu_header(ctx: *mu_Context, label: *char) sint { return mu_header_ex(ctx, label, 0); }
 func mu_begin_treenode(ctx: *mu_Context, label: *char) sint { return mu_begin_treenode_ex(ctx, label, 0); }
 func mu_begin_window(ctx: *mu_Context, title: *char, rect: mu_Rect) sint { return mu_begin_window_ex(ctx, title, rect, 0); }
@@ -248,6 +247,7 @@ extern func mu_textbox_ex(ctx: *mu_Context, buf: *char, bufsz: sint, opt: sint)
 extern func mu_textbox_raw(ctx: *mu_Context, buf: *char, bufsz: sint, id: mu_Id, r: mu_Rect, opt: sint) sint;
 extern func mu_slider(ctx: *mu_Context, value: *mu_Real, lo: mu_Real, hi: mu_Real) sint;
 extern func mu_slider_ex(ctx: *mu_Context, value: *mu_Real, low: mu_Real, high: mu_Real, step: mu_Real, fmt: *char, opt: sint) sint;
+extern func mu_number(ctx: *mu_Context, value: *mu_Real, step: mu_Real) sint;
 extern func mu_number_ex(ctx: *mu_Context, value: *mu_Real, step: mu_Real, fmt: *char, opt: sint) sint;
 extern func mu_begin_treenode_ex(ctx: *mu_Context, label: *char, opt: sint) sint;
 extern func mu_end_treenode(ctx: *mu_Context) void;