From 46b503f6800372c80773c208e986eb0ae976d80d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 18 Apr 2022 10:27:31 -0400 Subject: [PATCH] simplify some UI code --- src/math_app.rs | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/math_app.rs b/src/math_app.rs index 91264bf..ab37aa4 100644 --- a/src/math_app.rs +++ b/src/math_app.rs @@ -389,33 +389,29 @@ impl MathApp { "Right", ); }); + let riemann_changed = prev_sum != self.settings.riemann_sum; - // Config options for Extrema and roots - let mut extrema_toggled: bool = false; - let mut roots_toggled: bool = false; ui.horizontal(|ui| { - extrema_toggled = ui - .add(Button::new("Extrema")) - .on_hover_text(match self.settings.do_extrema { - true => "Disable Displaying Extrema", - false => "Display Extrema", - }) - .clicked(); + self.settings.do_extrema.bitxor_assign( + ui.add(Button::new("Extrema")) + .on_hover_text(match self.settings.do_extrema { + true => "Disable Displaying Extrema", + false => "Display Extrema", + }) + .clicked(), + ); - roots_toggled = ui - .add(Button::new("Roots")) - .on_hover_text(match self.settings.do_roots { - true => "Disable Displaying Roots", - false => "Display Roots", - }) - .clicked(); + self.settings.do_roots.bitxor_assign( + ui.add(Button::new("Roots")) + .on_hover_text(match self.settings.do_roots { + true => "Disable Displaying Roots", + false => "Display Roots", + }) + .clicked(), + ); }); - // If options toggled, flip the boolean - self.settings.do_extrema.bitxor_assign(extrema_toggled); - self.settings.do_roots.bitxor_assign(roots_toggled); - let min_x_old = self.settings.integral_min_x; let min_x_changed = ui .add(