From 6b318e1383520049202849bed46c05133e6e2a1d Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 9 Mar 2016 18:59:50 +0100 Subject: [PATCH] [Horus] Cosmetics in popups --- radio/src/gui/horus/popups.cpp | 6 +----- radio/src/gui/horus/theme.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/horus/popups.cpp b/radio/src/gui/horus/popups.cpp index 67982f246..787a16ee9 100644 --- a/radio/src/gui/horus/popups.cpp +++ b/radio/src/gui/horus/popups.cpp @@ -78,12 +78,8 @@ void displayWarning(evt_t event) { warningResult = false; - theme->drawMessageBox(warningText, "", "", warningType); + theme->drawMessageBox(warningText, warningInfoText, warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS, warningType); - if (warningInfoText) { - lcdDrawSizedText(WARNING_LINE_X, WARNING_INFOLINE_Y, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS); - } - lcdDrawText(WARNING_LINE_X, WARNING_INFOLINE_Y+20, warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS); switch (event) { case EVT_KEY_BREAK(KEY_ENTER): if (warningType == WARNING_TYPE_ASTERISK) diff --git a/radio/src/gui/horus/theme.cpp b/radio/src/gui/horus/theme.cpp index f3ca54970..0a7cfdfbf 100644 --- a/radio/src/gui/horus/theme.cpp +++ b/radio/src/gui/horus/theme.cpp @@ -113,7 +113,7 @@ void Theme::drawMessageBox(const char * title, const char * text, const char * a } if (action) { - lcdDrawText(WARNING_LINE_X, WARNING_INFOLINE_Y+20, action); + lcdDrawText(WARNING_LINE_X, WARNING_INFOLINE_Y+24, action); } }