From 2214c54a05291f65eceeae8ec517c6cc9ab375d1 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 21 Oct 2019 12:08:06 +0200 Subject: [PATCH] A form / form widget can avoid to have the focus --- radio/src/thirdparty/libopenui/src/form.cpp | 8 +++++--- radio/src/thirdparty/libopenui/src/form.h | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp index 1a4b3b1e7..72c36662d 100644 --- a/radio/src/thirdparty/libopenui/src/form.cpp +++ b/radio/src/thirdparty/libopenui/src/form.cpp @@ -24,9 +24,11 @@ FormField::FormField(Window *parent, const rect_t & rect, WindowFlags windowFlags) : Window(parent, rect, windowFlags) { - FormGroup * form = dynamic_cast(parent); - if (form) { - form->addField(this); + if (!(windowFlags & FORM_NO_FOCUS)) { + FormGroup * form = dynamic_cast(parent); + if (form) { + form->addField(this); + } } } diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/thirdparty/libopenui/src/form.h index 73c57b804..30f5fe1e1 100644 --- a/radio/src/thirdparty/libopenui/src/form.h +++ b/radio/src/thirdparty/libopenui/src/form.h @@ -22,8 +22,9 @@ #include "window.h" -constexpr WindowFlags FORM_FORWARD_FOCUS = WINDOW_FLAGS_LAST << 1; -constexpr WindowFlags FORM_DETACHED = WINDOW_FLAGS_LAST << 2; +constexpr WindowFlags FORM_NO_FOCUS = WINDOW_FLAGS_LAST << 1; +constexpr WindowFlags FORM_FORWARD_FOCUS = WINDOW_FLAGS_LAST << 2; +constexpr WindowFlags FORM_DETACHED = WINDOW_FLAGS_LAST << 3; constexpr WindowFlags FORM_FLAGS_LAST = FORM_DETACHED; class FormField: public Window {