fix(UI): Increased period duration limits

mfep · May 11, 2024 · 4f128b7 · 4f128b7
1 parent 677f3f2
commit 4f128b7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/src/exercise_editor.rs b/src/exercise_editor.rs
@@ -31,6 +31,10 @@ pub enum ExerciseEditorOutput {
     Create(ExerciseSetup),
 }
 
+pub const SPIN_ROW_LOWER: f64 = 1f64;
+pub const SPIN_ROW_UPPER: f64 = 1000000f64;
+pub const SPIN_ROW_STEP: f64 = 1f64;
+
 #[relm4::component(pub)]
 impl relm4::SimpleComponent for ExerciseEditor {
     type Init = (ExerciseEditorRole, ExerciseSetup);
@@ -78,9 +82,9 @@ impl relm4::SimpleComponent for ExerciseEditor {
                         set_title: "Number of sets",
                         #[wrap(Some)]
                         set_adjustment = &gtk::Adjustment {
-                            set_lower: 1f64,
-                            set_upper: 999f64,
-                            set_step_increment: 1f64,
+                            set_lower: SPIN_ROW_LOWER,
+                            set_upper: SPIN_ROW_UPPER,
+                            set_step_increment: SPIN_ROW_STEP,
                             add_binding: (&model.sets, "value"),
                         },
                     },
@@ -89,9 +93,9 @@ impl relm4::SimpleComponent for ExerciseEditor {
                         set_subtitle: "seconds",
                         #[wrap(Some)]
                         set_adjustment = &gtk::Adjustment {
-                            set_lower: 1f64,
-                            set_upper: 999f64,
-                            set_step_increment: 1f64,
+                            set_lower: SPIN_ROW_LOWER,
+                            set_upper: SPIN_ROW_UPPER,
+                            set_step_increment: SPIN_ROW_STEP,
                             add_binding: (&model.rest_s, "value"),
                         },
                     },
@@ -100,9 +104,9 @@ impl relm4::SimpleComponent for ExerciseEditor {
                         set_subtitle: "seconds",
                         #[wrap(Some)]
                         set_adjustment = &gtk::Adjustment {
-                            set_lower: 1f64,
-                            set_upper: 999f64,
-                            set_step_increment: 1f64,
+                            set_lower: SPIN_ROW_LOWER,
+                            set_upper: SPIN_ROW_UPPER,
+                            set_step_increment: SPIN_ROW_STEP,
                             add_binding: (&model.exercise_s, "value"),
                         },
                     },

diff --git a/src/settings_dialog.rs b/src/settings_dialog.rs
@@ -1,4 +1,7 @@
-use crate::settings::*;
+use crate::{
+    exercise_editor::{SPIN_ROW_STEP, SPIN_ROW_UPPER},
+    settings::*,
+};
 
 use relm4::{
     self,
@@ -35,8 +38,8 @@ impl Component for SettingsDialogModel {
                             #[name = "warmup_adjust"]
                             set_adjustment = &gtk::Adjustment {
                                 set_lower: 0.0,
-                                set_upper: 999.0,
-                                set_step_increment: 1.0,
+                                set_upper: SPIN_ROW_UPPER,
+                                set_step_increment: SPIN_ROW_STEP,
                                 add_binding: (&init.warmup_s, "value"),
                             },
                         },