From 378df03910636f24b2c26f7f06d08097738e2d22 Mon Sep 17 00:00:00 2001 From: rustbasic <127506429+rustbasic@users.noreply.github.com> Date: Wed, 31 Jul 2024 03:11:33 +0900 Subject: [PATCH] Clamp margin values in `Margin::ui` (#4873) limit margin value in `settings.ui()`. Issues: If the `window margin` of `settings.ui()` becomes -10.0 or less, a panic occurs. --- crates/egui/src/style.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/egui/src/style.rs b/crates/egui/src/style.rs index 21d542c5..b85d849a 100644 --- a/crates/egui/src/style.rs +++ b/crates/egui/src/style.rs @@ -2222,7 +2222,7 @@ impl Widget for &mut Margin { ui.checkbox(&mut same, "same"); let mut value = self.left; - ui.add(DragValue::new(&mut value)); + ui.add(DragValue::new(&mut value).range(0.0..=100.0)); *self = Margin::same(value); }) .response @@ -2232,19 +2232,19 @@ impl Widget for &mut Margin { crate::Grid::new("margin").num_columns(2).show(ui, |ui| { ui.label("Left"); - ui.add(DragValue::new(&mut self.left)); + ui.add(DragValue::new(&mut self.left).range(0.0..=100.0)); ui.end_row(); ui.label("Right"); - ui.add(DragValue::new(&mut self.right)); + ui.add(DragValue::new(&mut self.right).range(0.0..=100.0)); ui.end_row(); ui.label("Top"); - ui.add(DragValue::new(&mut self.top)); + ui.add(DragValue::new(&mut self.top).range(0.0..=100.0)); ui.end_row(); ui.label("Bottom"); - ui.add(DragValue::new(&mut self.bottom)); + ui.add(DragValue::new(&mut self.bottom).range(0.0..=100.0)); ui.end_row(); }); })