From 7f724c187d1cbf67080a5ae7e5fcb0911550f1f9 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 24 Jan 2022 16:08:13 +0100
Subject: [PATCH] Fixed scrolling

---
 radio/src/thirdparty/libopenui/src/keyboard_base.cpp | 4 ++--
 radio/src/thirdparty/libopenui/src/menu.cpp          | 2 +-
 radio/src/thirdparty/libopenui/src/menutoolbar.h     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/keyboard_base.cpp b/radio/src/thirdparty/libopenui/src/keyboard_base.cpp
index 50bb07051..6475e66ed 100644
--- a/radio/src/thirdparty/libopenui/src/keyboard_base.cpp
+++ b/radio/src/thirdparty/libopenui/src/keyboard_base.cpp
@@ -99,12 +99,12 @@ void Keyboard::setField(FormField* newField)
 #endif      
       // scroll the header of the window out of view to get more space to
       // see the field being edited
-      fieldContainer->setScrollPositionY(fields->top());
+      lv_obj_scroll_to_y(fieldContainer->getLvObj(), fields->top(), LV_ANIM_OFF);
       oldHeight = fields->height();
       fields->setHeight(newHeight);
 
       coord_t offsetY = calcScrollOffsetForField(newField, fields);
-      fields->setScrollPositionY(offsetY);
+      lv_obj_scroll_to_y(fields->getLvObj(), offsetY, LV_ANIM_OFF);
     } else {
       // TODO: what happens if field container is null. 
       // we will need to interrogate the fieldContainer for its
diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/thirdparty/libopenui/src/menu.cpp
index 9d25a6d51..952c7e614 100644
--- a/radio/src/thirdparty/libopenui/src/menu.cpp
+++ b/radio/src/thirdparty/libopenui/src/menu.cpp
@@ -42,7 +42,7 @@ void MenuBody::setIndex(int index)
     scrollY += lines[i].lineHeight();
 
   if (innerHeight > height()) {
-    setScrollPositionY(scrollY - 3 * MENUS_LINE_HEIGHT);
+    lv_obj_scroll_to_y(lvobj, scrollY - 3 * MENUS_LINE_HEIGHT, LV_ANIM_OFF);
   }
 
   invalidate();
diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.h b/radio/src/thirdparty/libopenui/src/menutoolbar.h
index a4f57834e..49e37817c 100644
--- a/radio/src/thirdparty/libopenui/src/menutoolbar.h
+++ b/radio/src/thirdparty/libopenui/src/menutoolbar.h
@@ -90,7 +90,7 @@ class MenuToolbar: public FormGroup {
           scrollTo(button);
         }
         else {
-          setScrollPositionY(0);
+          lv_obj_scroll_to_y(lvobj, 0, LV_ANIM_OFF);
         }
       }
     }