From 4a8bd74d84d9a11b017eeaf22c63df730129143e Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@gmail.com>
Date: Wed, 18 May 2022 22:56:41 -0400
Subject: [PATCH] improve integral options

---
 src/consts.rs   |  5 -----
 src/math_app.rs | 27 +++++++++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/consts.rs b/src/consts.rs
index 3fc94eb..fb3afcf 100644
--- a/src/consts.rs
+++ b/src/consts.rs
@@ -1,5 +1,3 @@
-use std::ops::RangeInclusive;
-
 use const_format::formatc;
 use epaint::Color32;
 use shadow_rs::shadow;
@@ -18,9 +16,6 @@ pub const BUILD_INFO: &str = formatc!(
 
 // Hard-Coded limits
 
-/// Range of acceptable input values for integral_num
-pub const INTEGRAL_NUM_RANGE: RangeInclusive<usize> = 1..=50000;
-
 // Default values
 /// Default minimum X value to display
 pub const DEFAULT_MIN_X: f64 = -10.0;
diff --git a/src/math_app.rs b/src/math_app.rs
index 92f03de..cfc4b77 100644
--- a/src/math_app.rs
+++ b/src/math_app.rs
@@ -6,7 +6,7 @@ use crate::misc::{dyn_mut_iter, option_vec_printer};
 use eframe::App;
 use egui::{
 	plot::Plot, style::Margin, Button, CentralPanel, ComboBox, Context, Frame, Key, Layout,
-	SidePanel, Slider, TopBottomPanel, Vec2, Window,
+	SidePanel, TopBottomPanel, Vec2, Window,
 };
 use egui::{DragValue, Ui};
 use emath::{Align, Align2};
@@ -276,6 +276,10 @@ impl MathApp {
 				let prev_sum = self.settings.riemann_sum;
 				// ComboBox for selecting what Riemann sum type to use
 				ui.add_enabled_ui(any_using_integral, |ui| {
+					let spacing_mut = ui.spacing_mut();
+
+					spacing_mut.item_spacing.x = 1.0;
+					spacing_mut.interact_size *= 0.5;
 					ComboBox::from_label("Riemann Sum")
 						.selected_text(self.settings.riemann_sum.to_string())
 						.show_ui(ui, |ui| {
@@ -303,10 +307,10 @@ impl MathApp {
 
 					let (min_x_changed, max_x_changed) = ui
 						.horizontal(|ui: &mut Ui| {
-							let spacing_mut = ui.spacing_mut();
+							// let spacing_mut = ui.spacing_mut();
 
-							spacing_mut.item_spacing = Vec2::new(1.0, 0.0);
-							spacing_mut.interact_size *= 0.5;
+							// spacing_mut.item_spacing = Vec2::new(1.0, 0.0);
+							// spacing_mut.interact_size *= 0.5;
 
 							ui.label("Integral: [");
 							let min_x_changed = ui
@@ -336,12 +340,15 @@ impl MathApp {
 
 					// Number of Rectangles for Riemann sum
 					let integral_num_changed = ui
-						.add_enabled(
-							any_using_integral,
-							Slider::new(&mut self.settings.integral_num, INTEGRAL_NUM_RANGE)
-								.text("Interval"),
-						)
-						.changed();
+						.horizontal(|ui| {
+							let spacing_mut = ui.spacing_mut();
+
+							spacing_mut.item_spacing.x = 1.5;
+							ui.label("Interval:");
+							ui.add(DragValue::new(&mut self.settings.integral_num))
+								.changed()
+						})
+						.inner;
 
 					self.settings.integral_changed = any_using_integral
 						&& (max_x_changed | min_x_changed | integral_num_changed | riemann_changed);