Keep the paddle on screen in whole

As suggested in InfiniTimeOrg#1062 in point 3. The paddle should be kept on screen and not travel out of the screen boundaries. Co-authored-by: Riku Isokoski <[email protected]>
NeroBurner · Apr 18, 2022 · 59be026 · 59be026
1 parent ed91b5a
commit 59be026
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/displayapp/screens/Paddle.cpp b/src/displayapp/screens/Paddle.cpp
@@ -85,7 +85,14 @@ bool Paddle::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
 
 bool Paddle::OnTouchEvent(uint16_t x, uint16_t y) {
   // sets the center paddle pos. (30px offset) with the the y_coordinate of the finger
-  lv_obj_set_pos(paddle, 0, y - 30);
+  // but clamp it such that the paddle never clips off screen
+  if (y < 31) {
+    lv_obj_set_pos(paddle, 0, 1);
+  } else if (y > LV_VER_RES - 31) {
+    lv_obj_set_pos(paddle, 0, LV_VER_RES - 61);
+  } else {
+    lv_obj_set_pos(paddle, 0, y - 30);
+  }
   paddlePos = y;
   return true;
 }