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

Make sure plot size is positive (#4429) 

* Closes #4425 

Fix: in Plot, Minimum values for screen protection.
This commit is contained in:
rustbasic 2024-05-11 23:49:27 +09:00 committed by GitHub
parent e06b225dab
commit 3b3ce22adc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/egui_demo_lib/src/demo/context_menu.rs
View File

@ -97,11 +97,13 @@ impl super::View for ContextMenus {
egui::Grid::new("button_grid").show(ui, |ui| { egui::Grid::new("button_grid").show(ui, |ui| {
ui.add( ui.add(
egui::DragValue::new(&mut self.width) egui::DragValue::new(&mut self.width)
.clamp_range(0.0..=f32::INFINITY)
.speed(1.0) .speed(1.0)
.prefix("Width: "), .prefix("Width: "),
); );
ui.add( ui.add(
egui::DragValue::new(&mut self.height) egui::DragValue::new(&mut self.height)
.clamp_range(0.0..=f32::INFINITY)
.speed(1.0) .speed(1.0)
.prefix("Height: "), .prefix("Height: "),
); );

6
crates/egui_plot/src/lib.rs
View File

@ -742,7 +742,7 @@ impl Plot {
margin_fraction, margin_fraction,
width, width,
height, height,
min_size, mut min_size,
data_aspect, data_aspect,
view_aspect, view_aspect,
mut show_x, mut show_x,
@ -773,6 +773,10 @@ impl Plot {
// Determine position of widget. // Determine position of widget.
let pos = ui.available_rect_before_wrap().min; let pos = ui.available_rect_before_wrap().min;
// Minimum values for screen protection
min_size.x = min_size.x.at_least(1.0);
min_size.y = min_size.y.at_least(1.0);
// Determine size of widget. // Determine size of widget.
let size = { let size = {
let width = width let width = width