skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
rustbasic 2024-07-31 03:11:33 +09:00 committed by GitHub
parent 64d5f948e4
commit 378df03910
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/egui/src/style.rs
View File

@ -2222,7 +2222,7 @@ impl Widget for &mut Margin {
ui.checkbox(&mut same, "same"); ui.checkbox(&mut same, "same");
let mut value = self.left; 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); *self = Margin::same(value);
}) })
.response .response
@ -2232,19 +2232,19 @@ impl Widget for &mut Margin {
crate::Grid::new("margin").num_columns(2).show(ui, |ui| { crate::Grid::new("margin").num_columns(2).show(ui, |ui| {
ui.label("Left"); 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.end_row();
ui.label("Right"); 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.end_row();
ui.label("Top"); 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.end_row();
ui.label("Bottom"); 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(); ui.end_row();
}); });
}) })