From 0c6f3df4f797359127a6b9089f5c8d771bf3f3ea Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Mon, 13 Jun 2022 17:58:33 +0200 Subject: [PATCH] Made UI a bit better, fix for landscape --- src/changevaluedisplay.cpp | 19 ++++++++++++++----- src/changevaluedisplay.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/changevaluedisplay.cpp b/src/changevaluedisplay.cpp index 0660d78..bd07f64 100644 --- a/src/changevaluedisplay.cpp +++ b/src/changevaluedisplay.cpp @@ -8,15 +8,24 @@ void ChangeValueDisplayInterface::initScreen() { Base::initScreen(); - tft.drawRect(25, 75, 190, 65, TFT_WHITE); + tft.drawRoundRect(35, 65, 190, 65, 8, TFT_WHITE); m_valueLabel.start(); tft.setTextFont(4); tft.setTextColor(TFT_WHITE); - tft.drawString("Change value and", 10, 160); - tft.drawString("press button to", 10, 185); - tft.drawString("confirm and go", 10, 210); - tft.drawString("back.", 10, 235); + if (espgui::isLandscape()) + { + tft.drawString("Change value and press", 10, 152); + tft.drawString("button to confirm and", 10, 177); + tft.drawString("go back", 10, 202); + } + else + { + tft.drawString("Change value and", 10, 160); + tft.drawString("press button to", 10, 185); + tft.drawString("confirm and go", 10, 210); + tft.drawString("back.", 10, 235); + } } template<> diff --git a/src/changevaluedisplay.h b/src/changevaluedisplay.h index ca98003..1988020 100644 --- a/src/changevaluedisplay.h +++ b/src/changevaluedisplay.h @@ -33,7 +33,7 @@ public: virtual void setShownValue(int value) = 0; protected: - Label m_valueLabel{26, 81}; // 188, 53 + Label m_valueLabel{36, 71}; // 188, 53 }; template