From 0a397706afd09f256635c077f46b0707ba4b0799 Mon Sep 17 00:00:00 2001
From: MatthewColvin <mcolvin32.7@gmail.com>
Date: Thu, 12 Oct 2023 09:48:24 -0500
Subject: [PATCH] added ability to adjust brightness slider height easily

---
 .../BasicRefactored/page/DisplaySettings.cpp  |  2 +-
 .../widget/BrightnessSlider.cpp               | 44 +++++++++----------
 Platformio/OmoteUI/core/UIElement.cpp         |  6 +++
 Platformio/OmoteUI/core/UIElement.hpp         |  3 ++
 Platformio/OmoteUI/core/widget/Slider.cpp     |  3 +-
 Platformio/OmoteUI/core/widget/WidgetBase.cpp | 12 ++++-
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp b/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp
index 8f10dd6..668abd4 100644
--- a/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp
+++ b/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp
@@ -9,7 +9,7 @@ DisplaySettings::DisplaySettings(std::shared_ptr<DisplayAbstract> aDisplay)
   SetBgColor(Color::GREY);
 
   mBrightnessSlider->SetWidth(GetContentWidth());
-  mBrightnessSlider->SetHeight(50);
+  mBrightnessSlider->SetHeight(80);
   mBrightnessSlider->AlignTo(this, LV_ALIGN_TOP_MID);
 }
 
diff --git a/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.cpp b/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.cpp
index 72e9003..01670ca 100644
--- a/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.cpp
+++ b/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.cpp
@@ -4,30 +4,30 @@
 
 using namespace UI::Widget;
 
-
-BrightnessSlider::BrightnessSlider(std::shared_ptr<DisplayAbstract> aDisplay): Base(ID::Widgets::BrightnessSlider),
-  mDisplay(aDisplay),
-  mSlider(AddElement<Widget::Slider>(std::make_unique<Slider>(
-    [this](auto aNewBrightness){
-        mDisplay->setBrightness(aNewBrightness);
-    },0,255))),
-  mLabel(AddElement<Widget::Label>(std::make_unique<Label>("Brightness")))
-{
-    mLabel->AlignTo(this,LV_ALIGN_TOP_MID);
-    mSlider->AlignTo(mLabel,LV_ALIGN_OUT_BOTTOM_MID);
-    mSlider->SetWidth(GetContentWidth() - 20);
+BrightnessSlider::BrightnessSlider(std::shared_ptr<DisplayAbstract> aDisplay)
+    : Base(ID::Widgets::BrightnessSlider), mDisplay(aDisplay),
+      mSlider(AddElement<Widget::Slider>(std::make_unique<Slider>(
+          [this](auto aNewBrightness) {
+            mDisplay->setBrightness(aNewBrightness);
+          },
+          0, 255))),
+      mLabel(AddElement<Widget::Label>(std::make_unique<Label>("Brightness"))) {
+  mLabel->AlignTo(this, LV_ALIGN_TOP_MID);
+  mSlider->AlignTo(mLabel, LV_ALIGN_OUT_BOTTOM_MID);
+  mSlider->SetWidth(GetContentWidth() - GetContentWidth() * 0.25f);
 }
 
-void BrightnessSlider::OnShow(){
-    mSlider->SetValue(mDisplay->getBrightness());
+void BrightnessSlider::OnShow() {
+  mSlider->SetValue(mDisplay->getBrightness());
 }
 
-void BrightnessSlider::SetHeight(lv_coord_t aHeight){
-    Base::SetHeight(aHeight);
-    auto labelHeight = GetContentHeight() * 0.25f;
-    auto sliderHeight = aHeight - labelHeight;
-    mLabel->SetHeight(labelHeight);
-    mSlider->SetHeight(sliderHeight);
-    mLabel->AlignTo(this,LV_ALIGN_TOP_MID);
-    mSlider->AlignTo(mLabel,LV_ALIGN_OUT_BOTTOM_MID);
+void BrightnessSlider::SetHeight(lv_coord_t aHeight) {
+  Base::SetHeight(aHeight);
+  auto labelHeight = 12;
+  auto sliderHeight = aHeight * 0.60f - labelHeight;
+  mLabel->SetHeight(labelHeight);
+  mSlider->SetHeight(sliderHeight);
+  mLabel->AlignTo(this, LV_ALIGN_TOP_MID);
+  mSlider->AlignTo(mLabel, LV_ALIGN_OUT_BOTTOM_MID, 0,
+                   mLabel->GetContentHeight());
 }
\ No newline at end of file
diff --git a/Platformio/OmoteUI/core/UIElement.cpp b/Platformio/OmoteUI/core/UIElement.cpp
index f8b8a46..69eb38e 100644
--- a/Platformio/OmoteUI/core/UIElement.cpp
+++ b/Platformio/OmoteUI/core/UIElement.cpp
@@ -243,6 +243,12 @@ void UIElement::SetBgColor(lv_color_t aColor, lv_style_selector_t aStyle) {
   });
 };
 
+void UIElement::SetBgOpacity(lv_opa_t aOpacity, lv_style_selector_t aStyle) {
+  LvglResourceManager::GetInstance().AttemptNow([this, aOpacity, aStyle] {
+    lv_obj_set_style_bg_opa(mLvglSelf, aOpacity, aStyle);
+  });
+}
+
 void UIElement::Show() {
   if (IsVisible()) {
     return;
diff --git a/Platformio/OmoteUI/core/UIElement.hpp b/Platformio/OmoteUI/core/UIElement.hpp
index 537619b..c62e870 100644
--- a/Platformio/OmoteUI/core/UIElement.hpp
+++ b/Platformio/OmoteUI/core/UIElement.hpp
@@ -21,6 +21,9 @@ public:
   virtual void SetBgColor(lv_color_t value,
                           lv_style_selector_t selector = LV_PART_MAIN);
 
+  virtual void SetBgOpacity(lv_opa_t aOpacity,
+                            lv_style_selector_t aStyle = LV_PART_MAIN);
+
   void SetVisiblity(bool aVisibility);
   bool IsVisible();
 
diff --git a/Platformio/OmoteUI/core/widget/Slider.cpp b/Platformio/OmoteUI/core/widget/Slider.cpp
index b646471..63e41c4 100644
--- a/Platformio/OmoteUI/core/widget/Slider.cpp
+++ b/Platformio/OmoteUI/core/widget/Slider.cpp
@@ -6,7 +6,8 @@ using namespace UI::Widget;
 
 Slider::Slider(std::function<void(int32_t)> aOnSliderValueChange,
                int32_t aMinVal, int32_t aMaxVal)
-    : Base(lv_slider_create(UI::Screen::BackgroundScreen::getLvInstance()),ID::Widgets::Slider),
+    : Base(lv_slider_create(UI::Screen::BackgroundScreen::getLvInstance()),
+           ID::Widgets::Slider),
       mOnSliderChange(std::move(aOnSliderValueChange)) {
   auto lock = LvglResourceManager::GetInstance().scopeLock();
   lv_slider_set_range(LvglSelf(), aMinVal, aMaxVal);
diff --git a/Platformio/OmoteUI/core/widget/WidgetBase.cpp b/Platformio/OmoteUI/core/widget/WidgetBase.cpp
index b4f8c58..636c837 100644
--- a/Platformio/OmoteUI/core/widget/WidgetBase.cpp
+++ b/Platformio/OmoteUI/core/widget/WidgetBase.cpp
@@ -4,12 +4,20 @@
 using namespace UI;
 using namespace UI::Widget;
 
-Base::Base(ID anId): UIElement(lv_obj_create(Screen::BackgroundScreen::getLvInstance()),anId){
+// Constructor typically used as a container for other widgets
+Base::Base(ID anId)
+    : UIElement(lv_obj_create(Screen::BackgroundScreen::getLvInstance()),
+                anId) {
   SetWidth(lv_pct(100));
   SetHeight(lv_pct(100));
+  SetPadding(Padding());
+  SetOutline(Outline());
+  SetBorder(Border());
+  SetBgOpacity(LV_OPA_TRANSP);
 }
 
-Base::Base(lv_obj_t *aLvglSelf, ID anId) : UIElement(aLvglSelf,anId) {
+Base::Base(lv_obj_t *aLvglSelf, ID anId) : UIElement(aLvglSelf, anId) {
   SetWidth(lv_pct(100));
   SetHeight(lv_pct(100));
+  SetBorder(Border());
 }