Merge 7e4769e319 into dev

2020-08-23 06:50:03 +00:00
parent 75a0a5e6d6 7e4769e319
commit 5f35e46be8
2 changed files with 2 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@

 ### Bugfixes
 - Fix color bleeding on border drawing
+- Fix using 'LV_SCROLLBAR_UNHIDE' after 'LV_SCROLLBAR_ON'

 ## v7.3.1 (18.08.2020)

--- a/src/lv_widgets/lv_page.h
+++ b/src/lv_widgets/lv_page.h
@@ -41,7 +41,7 @@ enum {
    LV_SCROLLBAR_MODE_DRAG   = 0x2, /**< Show scroll bars when page is being dragged*/
    LV_SCROLLBAR_MODE_AUTO   = 0x3, /**< Show scroll bars when the scrollable container is large enough to be scrolled*/
    LV_SCROLLBAR_MODE_HIDE   = 0x4, /**< Hide the scroll bar temporally*/
-    LV_SCROLLBAR_MODE_UNHIDE = 0x5, /**< Unhide the previously hidden scroll bar. Recover original mode too*/
+    LV_SCROLLBAR_MODE_UNHIDE = 0x8, /**< Unhide the previously hidden scroll bar. Recover original mode too*/
 };
 typedef uint8_t lv_scrollbar_mode_t;