From d83f8e12fae5589f59ad5949187a1177370fd3ee Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 24 May 2021 17:50:47 +0200 Subject: [PATCH] Catch touch-end in MessageDialog Resolves #72 --- radio/src/gui/colorlcd/message_dialog.cpp | 17 +++++++++++++---- radio/src/thirdparty/libopenui | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/colorlcd/message_dialog.cpp b/radio/src/gui/colorlcd/message_dialog.cpp index 3b26161f0..2c1cfe992 100644 --- a/radio/src/gui/colorlcd/message_dialog.cpp +++ b/radio/src/gui/colorlcd/message_dialog.cpp @@ -20,11 +20,20 @@ #include "message_dialog.h" #include "static.h" -MessageDialog::MessageDialog(Window * parent, const char * title, const char * message, const char * info): - Dialog(parent, title, {50, 73, LCD_W - 100, LCD_H - 146}) +MessageDialog::MessageDialog(Window* parent, const char* title, + const char* message, const char* info) : + Dialog(parent, title, {50, 73, LCD_W - 100, LCD_H - 146}) { - messageWidget = new StaticText(this, {0, coord_t(height() - PAGE_LINE_HEIGHT) / 2, width(), PAGE_LINE_HEIGHT}, message, 0, CENTERED); - infoWidget = new StaticText(this, {0, 30 + coord_t(height() - PAGE_LINE_HEIGHT) / 2, width(), PAGE_LINE_HEIGHT}, info, 0, CENTERED); + messageWidget = new StaticText( + this, + {0, coord_t(height() - PAGE_LINE_HEIGHT) / 2, width(), PAGE_LINE_HEIGHT}, + message, 0, CENTERED); + + infoWidget = new StaticText(this, + {0, 30 + coord_t(height() - PAGE_LINE_HEIGHT) / 2, + width(), PAGE_LINE_HEIGHT}, + info, 0, CENTERED); + setCloseWhenClickOutside(true); } #if defined(HARDWARE_KEYS) diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 1930a0308..c072dca43 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 1930a03088dbb155528f0c6cb524e30e93799626 +Subproject commit c072dca43c232ab23c95035ec7b879cf84a64810