From 49ba2e46b2c2ff26b38d3a32b5ea74af0368e8be Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 24 Jan 2022 07:09:19 +0100
Subject: [PATCH] Some more fixes related to scrolling

---
 radio/src/thirdparty/libopenui/src/window.cpp | 16 ----------------
 radio/src/thirdparty/libopenui/src/window.h   |  6 +++---
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp
index d44912588..0176c427c 100644
--- a/radio/src/thirdparty/libopenui/src/window.cpp
+++ b/radio/src/thirdparty/libopenui/src/window.cpp
@@ -562,22 +562,6 @@ bool Window::onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
     }
   }
 
-  if (slidingWindow && slidingWindow != this) {
-    return false;
-  }
-
-  if (slideY && innerHeight > rect.h) {
-    setScrollPositionY(scrollPositionY - slideY);
-    slidingWindow = this;
-    return true;
-  }
-
-  if (slideX && innerWidth > rect.w) {
-    setScrollPositionX(scrollPositionX - slideX);
-    slidingWindow = this;
-    return true;
-  }
-
   return false;
 }
 #endif
diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/thirdparty/libopenui/src/window.h
index 925632393..a63158bb4 100644
--- a/radio/src/thirdparty/libopenui/src/window.h
+++ b/radio/src/thirdparty/libopenui/src/window.h
@@ -215,7 +215,7 @@ class Window
       if (windowFlags & FORWARD_SCROLL)
         innerHeight = value;
       else if (innerHeight <= value) {
-        setScrollPositionY(0);
+        lv_obj_scroll_to_y(lvobj, 0, LV_ANIM_OFF);
       }
       invalidate();
     }
@@ -325,12 +325,12 @@ class Window
         parent->adjustInnerHeight();
       }
       else if (height() >= h) {
-        setScrollPositionY(0);
+        lv_obj_scroll_to_y(lvobj, 0, LV_ANIM_OFF);
       }
       else {
         coord_t maxScrollPosition = h - height();
         if (scrollPositionY > maxScrollPosition) {
-          setScrollPositionY(maxScrollPosition);
+          lv_obj_scroll_to_y(lvobj, maxScrollPosition, LV_ANIM_OFF);
         }
       }
       invalidate();