djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[DragValue] add optional range

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-09-06 07:07:02 +02:00
parent 938c847c6e
commit a9fd7537c2
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
egui/src/style.rs
View file

@ -432,10 +432,10 @@ impl Stroke {
pub fn ui(&mut self, ui: &mut crate::Ui, text: &str) {
let Self { width, color } = self;
ui.horizontal_centered(|ui| {
ui.style_mut().spacing.slider_width /= 2.0;
ui.label(format!("{}: ", text));
ui.add(Slider::f32(width, 0.0..=5.0).text("width"));
ui_color(ui, color, "color");
ui.add(DragValue::f32(width).speed(0.1).range(0.0..=5.0))
.tooltip_text("Width");
ui_color(ui, color, "Color");
});
}
}

13
egui/src/widgets.rs
View file

@ -15,6 +15,8 @@ pub use {slider::*, text_edit::*};
use paint::*;
use std::ops::RangeInclusive;
// ----------------------------------------------------------------------------
/// Anything implementing Widget can be added to a Ui with `Ui::add`
@ -580,6 +582,7 @@ pub struct DragValue<'a> {
speed: f32,
prefix: String,
suffix: String,
range: RangeInclusive<f64>,
}
impl<'a> DragValue<'a> {
@ -589,6 +592,7 @@ impl<'a> DragValue<'a> {
speed: 1.0,
prefix: Default::default(),
suffix: Default::default(),
range: f64::NEG_INFINITY..=f64::INFINITY,
}
}
@ -631,6 +635,12 @@ impl<'a> DragValue<'a> {
self
}
/// Clamp the value to this range
pub fn range(mut self, range: RangeInclusive<f64>) -> Self {
self.range = range;
self
}
/// Show a prefix before the number, e.g. "x: "
pub fn prefix(mut self, prefix: impl ToString) -> Self {
self.prefix = prefix.to_string();
@ -649,6 +659,7 @@ impl<'a> Widget for DragValue<'a> {
let Self {
mut value_function,
speed,
range,
prefix,
suffix,
} = self;
@ -674,6 +685,7 @@ impl<'a> Widget for DragValue<'a> {
.text_style(TextStyle::Monospace),
);
if let Ok(parsed_value) = value_text.parse() {
let parsed_value = clamp(parsed_value, range);
set(&mut value_function, parsed_value)
}
if ui.input().key_pressed(Key::Enter) {
@ -698,6 +710,7 @@ impl<'a> Widget for DragValue<'a> {
if delta_value != 0.0 {
let new_value = value + delta_value as f64;
let new_value = round_to_precision(new_value, precision);
let new_value = clamp(new_value, range);
set(&mut value_function, new_value);
// TODO: To make use or `smart_aim` for `DragValue` we need to store some state somewhere,
// otherwise we will just keep rounding to the same value while moving the mouse.