Improve zooming logic in game_of_life

iced-rs · May 1, 2020 · f2e63f1 · f2e63f1
1 parent c23995e
commit f2e63f1
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
@@ -187,6 +187,9 @@ mod grid {
     }
 
     impl Grid {
+        const MIN_SCALING: f32 = 0.1;
+        const MAX_SCALING: f32 = 2.0;
+
         pub fn tick(&mut self) {
             self.life.tick();
             self.cache.clear()
@@ -286,10 +289,12 @@ mod grid {
                     mouse::Event::WheelScrolled { delta } => match delta {
                         mouse::ScrollDelta::Lines { y, .. }
                         | mouse::ScrollDelta::Pixels { y, .. } => {
-                            if y > 0.0 && self.scaling < 2.0
-                                || y < 0.0 && self.scaling > 0.25
+                            if y < 0.0 && self.scaling > Self::MIN_SCALING
+                                || y > 0.0 && self.scaling < Self::MAX_SCALING
                             {
-                                self.scaling += y / 30.0;
+                                self.scaling = (self.scaling + y / 30.0)
+                                    .min(Self::MIN_SCALING)
+                                    .max(Self::MAX_SCALING);
 
                                 self.cache.clear();
                             }