From b99b72f9db3c61afd79c6455f7784bd3957ecda1 Mon Sep 17 00:00:00 2001 From: rustbasic <127506429+rustbasic@users.noreply.github.com> Date: Sun, 28 Apr 2024 17:31:02 +0900 Subject: [PATCH 1/6] Update lib.rs --- crates/egui_plot/src/lib.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/egui_plot/src/lib.rs b/crates/egui_plot/src/lib.rs index 2e31f8312f5..45ee7e2fe0c 100644 --- a/crates/egui_plot/src/lib.rs +++ b/crates/egui_plot/src/lib.rs @@ -742,7 +742,7 @@ impl Plot { margin_fraction, width, height, - min_size, + mut min_size, data_aspect, view_aspect, mut show_x, @@ -768,6 +768,9 @@ impl Plot { // Determine position of widget. let pos = ui.available_rect_before_wrap().min; + min_size.x = min_size.x.at_least(10.0); + min_size.y = min_size.y.at_least(10.0); + // Determine size of widget. let size = { let width = width From a9f72cf2da58c3eb3616c2658ff7e301b275b9f9 Mon Sep 17 00:00:00 2001 From: rustbasic <127506429+rustbasic@users.noreply.github.com> Date: Sun, 28 Apr 2024 17:35:44 +0900 Subject: [PATCH 2/6] Update context_menu.rs --- crates/egui_demo_lib/src/demo/context_menu.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/egui_demo_lib/src/demo/context_menu.rs b/crates/egui_demo_lib/src/demo/context_menu.rs index 1b71eb4f787..623b3a72db0 100644 --- a/crates/egui_demo_lib/src/demo/context_menu.rs +++ b/crates/egui_demo_lib/src/demo/context_menu.rs @@ -1,4 +1,4 @@ -use egui::Vec2b; +use egui::{NumExt, Vec2b}; #[derive(Clone, Debug, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] @@ -105,7 +105,10 @@ impl super::View for ContextMenus { .speed(1.0) .prefix("Height: "), ); + self.width = self.width.at_least(1.0); + self.height = self.height.at_least(1.0); ui.end_row(); + ui.checkbox(&mut self.show_axes[0], "x-Axis"); ui.checkbox(&mut self.show_axes[1], "y-Axis"); ui.end_row(); From 50bdcc7b58590dc0bf21a8e3451ea2d5e1613b19 Mon Sep 17 00:00:00 2001 From: rustbasic <127506429+rustbasic@users.noreply.github.com> Date: Sun, 28 Apr 2024 17:38:14 +0900 Subject: [PATCH 3/6] Update lib.rs --- crates/egui_plot/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/egui_plot/src/lib.rs b/crates/egui_plot/src/lib.rs index 45ee7e2fe0c..460d71de351 100644 --- a/crates/egui_plot/src/lib.rs +++ b/crates/egui_plot/src/lib.rs @@ -768,7 +768,7 @@ impl Plot { // Determine position of widget. let pos = ui.available_rect_before_wrap().min; - min_size.x = min_size.x.at_least(10.0); + min_size.x = min_size.x.at_least(64.0); min_size.y = min_size.y.at_least(10.0); // Determine size of widget. From a7871a58823d9818339e3bd6b076e33b97b03692 Mon Sep 17 00:00:00 2001 From: rustbasic <127506429+rustbasic@users.noreply.github.com> Date: Sun, 28 Apr 2024 17:44:25 +0900 Subject: [PATCH 4/6] Update lib.rs --- crates/egui_plot/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/egui_plot/src/lib.rs b/crates/egui_plot/src/lib.rs index 460d71de351..fc1850becc5 100644 --- a/crates/egui_plot/src/lib.rs +++ b/crates/egui_plot/src/lib.rs @@ -768,8 +768,9 @@ impl Plot { // Determine position of widget. let pos = ui.available_rect_before_wrap().min; + // Minimum values for screen protection min_size.x = min_size.x.at_least(64.0); - min_size.y = min_size.y.at_least(10.0); + min_size.y = min_size.y.at_least(15.0); // Determine size of widget. let size = { From 4912f40741e3c5c26cac3e333c7d238271464357 Mon Sep 17 00:00:00 2001 From: rustbasic <127506429+rustbasic@users.noreply.github.com> Date: Sat, 11 May 2024 17:46:24 +0900 Subject: [PATCH 5/6] Update context_menu.rs --- crates/egui_demo_lib/src/demo/context_menu.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/egui_demo_lib/src/demo/context_menu.rs b/crates/egui_demo_lib/src/demo/context_menu.rs index 623b3a72db0..5195a2b0609 100644 --- a/crates/egui_demo_lib/src/demo/context_menu.rs +++ b/crates/egui_demo_lib/src/demo/context_menu.rs @@ -1,4 +1,4 @@ -use egui::{NumExt, Vec2b}; +use egui::Vec2b; #[derive(Clone, Debug, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] @@ -97,18 +97,17 @@ impl super::View for ContextMenus { egui::Grid::new("button_grid").show(ui, |ui| { ui.add( egui::DragValue::new(&mut self.width) + .clamp_range(0.0..=f32::INFINITY) .speed(1.0) .prefix("Width: "), ); ui.add( egui::DragValue::new(&mut self.height) + .clamp_range(0.0..=f32::INFINITY) .speed(1.0) .prefix("Height: "), ); - self.width = self.width.at_least(1.0); - self.height = self.height.at_least(1.0); ui.end_row(); - ui.checkbox(&mut self.show_axes[0], "x-Axis"); ui.checkbox(&mut self.show_axes[1], "y-Axis"); ui.end_row(); From 46707dc19c554b63d887a6bb7c6faa0c439b74e7 Mon Sep 17 00:00:00 2001 From: rustbasic <127506429+rustbasic@users.noreply.github.com> Date: Sat, 11 May 2024 21:29:24 +0900 Subject: [PATCH 6/6] Update lib.rs --- crates/egui_plot/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/egui_plot/src/lib.rs b/crates/egui_plot/src/lib.rs index fc1850becc5..11bb1808ba9 100644 --- a/crates/egui_plot/src/lib.rs +++ b/crates/egui_plot/src/lib.rs @@ -769,8 +769,8 @@ impl Plot { // Determine position of widget. let pos = ui.available_rect_before_wrap().min; // Minimum values for screen protection - min_size.x = min_size.x.at_least(64.0); - min_size.y = min_size.y.at_least(15.0); + min_size.x = min_size.x.at_least(1.0); + min_size.y = min_size.y.at_least(1.0); // Determine size of widget. let size = {