From 01bf9bb99636248cd4af4cbf044b8a853cfddf7f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 23 Nov 2022 23:54:02 +0100 Subject: [PATCH] - slide: formatting code --- src/driver/slide.cpp | 7 ++----- src/driver/slide.h | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/driver/slide.cpp b/src/driver/slide.cpp index 548a50818..40cc14804 100644 --- a/src/driver/slide.cpp +++ b/src/driver/slide.cpp @@ -143,7 +143,7 @@ bool COSDSlider::SlideDone() { bool ret = false; - if (slideOut) // disappear + if (slideOut) // disappear { slideValue += STEPSIZE; @@ -156,7 +156,7 @@ bool COSDSlider::SlideDone() else setValue(slideValue); } - else // appears + else // appear { slideValue -= STEPSIZE; @@ -171,8 +171,5 @@ bool COSDSlider::SlideDone() setValue(slideValue); } - - return ret; } - diff --git a/src/driver/slide.h b/src/driver/slide.h index 020bb0c1d..884bdc85e 100644 --- a/src/driver/slide.h +++ b/src/driver/slide.h @@ -27,14 +27,14 @@ class COSDSlider { private: - uint32_t slideTimer; - int slideValue; - bool slideIn; - bool slideOut; - int proc_put(const char *path, char *value, int len); - void setValue(int val); - int slideMax; - int slideMode; + uint32_t slideTimer; + int slideValue; + bool slideIn; + bool slideOut; + int proc_put(const char *path, char *value, int len); + void setValue(int val); + int slideMax; + int slideMode; public: COSDSlider(int percent = 100, int mode = BOTTOM2TOP); @@ -46,6 +46,7 @@ class COSDSlider bool SlideDone(); bool SlideInDone() { return !slideIn && !slideOut; }; uint32_t GetSlideTimer() { return slideTimer; }; + enum { BEFORE_SLIDEIN = 1, @@ -53,6 +54,7 @@ class COSDSlider BEFORE_SLIDEOUT = 3, AFTER_SLIDEOUT = 4 }; + enum { MID2SIDE,