diff --git a/zahnrad.c b/zahnrad.c index 8833e5a..2bb2c43 100644 --- a/zahnrad.c +++ b/zahnrad.c @@ -4619,9 +4619,9 @@ zr_widget_drag(struct zr_command_buffer *out, struct zr_rect drag, } /* draw border + background */ - zr_command_buffer_push_rect(out, drag, d->rounding, d->border); + zr_command_buffer_push_rect(out, drag, 0, d->border); drag = zr_shrink_rect(drag, d->border_width); - zr_command_buffer_push_rect(out, drag, d->rounding, background); + zr_command_buffer_push_rect(out, drag, 0, background); /* draw value as text */ t.background = background; @@ -7421,6 +7421,7 @@ zr_drag_float(struct zr_context *layout, zr_float min, zr_float *val, const struct zr_input *i; enum zr_widget_state state; + zr_zero(&drag, sizeof(drag)); state = zr_widget(&bounds, layout); if (!state) return; i = (state == ZR_WIDGET_ROM || layout->flags & ZR_WINDOW_ROM) ? 0 : layout->input; @@ -7436,7 +7437,6 @@ zr_drag_float(struct zr_context *layout, zr_float min, zr_float *val, drag.active = config->colors[ZR_COLOR_DRAG_ACTIVE]; drag.text = config->colors[ZR_COLOR_TEXT]; drag.text_active = config->colors[ZR_COLOR_TEXT_ACTIVE]; - drag.rounding = config->rounding[ZR_ROUNDING_SLIDER]; *val = zr_widget_drag(layout->buffer, bounds, min, *val, max, inc_per_pixel, &drag, i, &config->font); } diff --git a/zahnrad.h b/zahnrad.h index 1e0c2ff..5df5f51 100644 --- a/zahnrad.h +++ b/zahnrad.h @@ -1971,8 +1971,6 @@ struct zr_drag { /* dragging widget text color */ struct zr_color text_active; /* dragging widget active widget text color */ - zr_float rounding; - /* dragging widget rounding */ zr_float border_width; /* dragging widget border width */ }; @@ -2451,7 +2449,6 @@ enum zr_style_rounding { ZR_ROUNDING_BUTTON, ZR_ROUNDING_SLIDER, ZR_ROUNDING_PROGRESS, - ZR_ROUNDING_DRAG, ZR_ROUNDING_CHECK, ZR_ROUNDING_INPUT, ZR_ROUNDING_GRAPH,