From 413ef78504278d37080b9b59a652e4bbd5e2a0fc Mon Sep 17 00:00:00 2001 From: kasull Date: Sun, 1 Mar 2026 20:18:08 -0500 Subject: editor ui rework add responsive editor relayout for window resize rework header with back/save, view mode buttons, and 2d view type selector add clipped, scrollable assets and contextual tool panels simplify tool button wiring and repeated layout logic simplify 2d top-down editor internals and shared grid update hooks --- src/gui/floatinput.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 3 deletions(-) (limited to 'src/gui/floatinput.cpp') diff --git a/src/gui/floatinput.cpp b/src/gui/floatinput.cpp index 9f7fdfe..5746758 100644 --- a/src/gui/floatinput.cpp +++ b/src/gui/floatinput.cpp @@ -1,6 +1,60 @@ #include "base.h" #include +const I32 FLOATINPUT_STEPPER_W = 11; + +static U8 gui_floatinput_has_stepper( GUI_FLOATINPUT* input ) { + return input->w >= 46; +} + +static I32 gui_floatinput_content_w( GUI_FLOATINPUT* input ) { + I32 reserve = gui_floatinput_has_stepper( input ) ? ( FLOATINPUT_STEPPER_W + 1 ) : 0; + I32 cw = input->w - reserve; + return cw < 1 ? 1 : cw; +} + +static void gui_floatinput_clamp_and_snap( GUI_FLOATINPUT* input ) { + if( isfinite( input->min ) && *input->pval < input->min ) + *input->pval = input->wraparound ? input->max : input->min; + if( isfinite( input->max ) && *input->pval > input->max ) + *input->pval = input->wraparound ? input->min : input->max; + + F32 step = input->step; + if( !isfinite( step ) || fabsf( step ) < 0.000001f ) + return; + + F32 rmn = remainderf( *input->pval, step ); + *input->pval -= rmn; +} + +static void gui_floatinput_draw_stepper( GUI_FLOATINPUT* input ) { + if( !gui_floatinput_has_stepper( input ) ) + return; + + I32 x = gui_relx( input ); + I32 y = gui_rely( input ); + I32 w = input->w; + I32 h = input->h; + I32 sx = x + w - FLOATINPUT_STEPPER_W; + I32 sy = y + 1; + I32 sh = h - 2; + I32 top_h = sh / 2; + I32 bot_h = sh - top_h; + + CLR border = gui_is_fg_window( input )? ui_clr.border : ui_clr.border_inactive; + gui_draw_frect( sx, sy, FLOATINPUT_STEPPER_W, sh, border ); + gui_draw_frect( sx + 1, sy + 1, FLOATINPUT_STEPPER_W - 2, sh - 2, ui_clr.bg_alt ); + gui_draw_line( sx + 1, sy + top_h, sx + FLOATINPUT_STEPPER_W - 1, sy + top_h, border ); + + I32 th = 0; + gui_draw_get_str_bounds( 0, &th, FNT_JPN12, "+" ); + I32 plus_y = sy + ( top_h - th ) / 2; + I32 minus_y = sy + top_h + ( bot_h - th ) / 2; + I32 cx = sx + FLOATINPUT_STEPPER_W / 2; + gui_draw_str( cx, plus_y, ALIGN_C, FNT_JPN12, ui_clr.txt, "+" ); + gui_draw_str( cx, minus_y, ALIGN_C, FNT_JPN12, ui_clr.txt, "-" ); +} + U8 gui_floatinput_is_bound_val( GUI_FLOATINPUT* input ) { if( input->wraparound ) return 0; @@ -26,7 +80,7 @@ CLR gui_floatinput_get_progress_clr( GUI_FLOATINPUT* input ) { void gui_floatinput_draw_bound( GUI_FLOATINPUT* input ) { I32 x = gui_relx( input ); I32 y = gui_rely( input ); - I32 w = input->w; + I32 w = gui_floatinput_content_w( input ); I32 h = input->h; F32 min = input->min; @@ -52,7 +106,7 @@ void gui_floatinput_draw_bound( GUI_FLOATINPUT* input ) { void gui_floatinput_draw_unbound( GUI_FLOATINPUT* input ) { I32 x = gui_relx( input ); I32 y = gui_rely( input ); - I32 w = input->w; + I32 w = gui_floatinput_content_w( input ); F32 val = *input->pval; @@ -104,6 +158,8 @@ void gui_floatinput_draw_fn( void* ptr ) { gui_floatinput_draw_unbound( input ); else gui_floatinput_draw_bound( input ); + + gui_floatinput_draw_stepper( input ); } void gui_floatinput_input_bound( GUI_FLOATINPUT* input ) { @@ -111,7 +167,7 @@ void gui_floatinput_input_bound( GUI_FLOATINPUT* input ) { return; I32 x = gui_relx( input ); - I32 w = input->w; + I32 w = gui_floatinput_content_w( input ); F32 min = input->min; F32 max = input->max; @@ -181,6 +237,7 @@ void gui_floatinput_input_fn( void* ptr ) { GUI_FLOATINPUT* input = (GUI_FLOATINPUT*)ptr; I32 m1 = gui_mbutton_down( 0 ); + I32 m2 = gui_mbutton_down( 1 ); I32 x = gui_relx( input ); I32 y = gui_rely( input ); @@ -190,10 +247,34 @@ void gui_floatinput_input_fn( void* ptr ) { I32 mx, my; gui_cursor_pos( &mx, &my ); U8 inbounds = mx >= x && mx <= x + w && my >= y && my <= y + h; + U8 has_stepper = gui_floatinput_has_stepper( input ); + I32 step_x = x + w - FLOATINPUT_STEPPER_W; + U8 in_stepper = has_stepper && inbounds && mx >= step_x; if( inbounds ) gui_floatinput_input_scroll( input ); + if( in_stepper ) { + if( !m1 && !m2 ) { + input->held = 0; + input->heldoutbounds = 0; + return; + } + + if( !input->held ) { + U8 fine = !!m2; + I32 split_y = y + 1 + ( h - 2 ) / 2; + U8 inc = my < split_y; + F32 step = fine ? 0.1f : 1.f; + *input->pval += inc ? step : -step; + gui_floatinput_clamp_and_snap( input ); + if( input->cb ) + input->cb( input ); + input->held = 1; + } + return; + } + if( !input->held && m1 && !inbounds ) input->heldoutbounds = 1; if( !input->heldoutbounds && m1 && inbounds ) { @@ -218,6 +299,7 @@ void gui_floatinput_input_fn( void* ptr ) { gui_floatinput_input_unbound( input ); else gui_floatinput_input_bound( input ); + gui_floatinput_clamp_and_snap( input ); if( input->cb && oldv != *input->pval ) { input->cb( input ); -- cgit v1.2.3