blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Fix: Number input on slider #111269

Merged
Christoph Lendenfeld merged 1 commits from ChrisLend/blender:fix_slider_num_input into main 2023-08-18 17:29:48 +02:00
Conversation 0 Commits 1 Files Changed 3 +14 -10
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/ED_util.hh
View File

@ -97,6 +97,7 @@ bool ED_slider_allow_increments_get(tSlider *slider);
void ED_slider_allow_increments_set(tSlider *slider, bool value);
void ED_slider_mode_set(tSlider *slider, SliderMode unit);
SliderMode ED_slider_mode_get(tSlider *slider);
void ED_slider_unit_set(tSlider *slider, const char *unit);
/* ************** XXX OLD CRUFT WARNING ************* */

16
source/blender/editors/space_graph/graph_slider_ops.cc
View File

@ -330,17 +330,15 @@ static int graph_slider_modal(bContext *C, wmOperator *op, const wmEvent *event)
default: {
if ((event->val == KM_PRESS) && handleNumInput(C, &gso->num, event)) {
float value;
float percentage = RNA_property_float_get(op->ptr, gso->factor_prop);
/* Grab percentage from numeric input, and store this new value for redo
* NOTE: users see ints, while internally we use a 0-1 float.
*/
value = percentage * 100.0f;
applyNumInput(&gso->num, &value);
percentage = value / 100.0f;
ED_slider_factor_set(gso->slider, percentage);
RNA_property_float_set(op->ptr, gso->factor_prop, percentage);
/* Grab percentage from numeric input, and store this new value for redo
* NOTE: users see ints, while internally we use a 0-1 float. */
if (ED_slider_mode_get(gso->slider) == SLIDER_MODE_PERCENT) {
value = value / 100.0f;
}
ED_slider_factor_set(gso->slider, value);
RNA_property_float_set(op->ptr, gso->factor_prop, value);
gso->modal_update(C, op);
break;

7
source/blender/editors/util/ed_draw.cc
View File

@ -543,7 +543,7 @@ void ED_slider_factor_set(tSlider *slider, const float factor)
slider->raw_factor = factor;
slider->factor = factor;
if (!slider->overshoot) {
slider->factor = clamp_f(slider->factor, 0, 1);
slider->factor = clamp_f(slider->factor, slider->factor_bounds[0], slider->factor_bounds[1]);
}
}
@ -576,6 +576,11 @@ void ED_slider_mode_set(tSlider *slider, SliderMode mode)
slider->slider_mode = mode;
}
SliderMode ED_slider_mode_get(tSlider *slider)
{
return slider->slider_mode;
}
void ED_slider_unit_set(tSlider *slider, const char *unit)
{
STRNCPY(slider->unit_string, unit);