piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

WindowFlags can be given on Choice creation

Browse Source
This commit is contained in:
Bertrand Songis
2020-03-18 10:47:36 +01:00
parent 17d7a45934
commit 7ceb25a519
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/choice.cpp
Vendored
+2 -2
View File
@@ -22,8 +22,8 @@
#include "theme.h"
Choice::Choice(FormGroup * parent, const rect_t & rect, const char * values, int16_t vmin, int16_t vmax,
std::function<int16_t()> getValue, std::function<void(int16_t)> setValue) :
ChoiceBase(parent, rect),
std::function<int16_t()> getValue, std::function<void(int16_t)> setValue, WindowFlags windowFlags) :
ChoiceBase(parent, rect, CHOICE_TYPE_DROPOWN, windowFlags),
values(values),
vmin(vmin),
vmax(vmax),
radio/src/thirdparty/libopenui/src/choice.h
Vendored
+3 -3
View File
@@ -29,8 +29,8 @@ enum ChoiceType {
class ChoiceBase : public FormField {
public:
ChoiceBase(FormGroup * parent, const rect_t & rect, ChoiceType type = CHOICE_TYPE_DROPOWN):
FormField(parent, rect),
ChoiceBase(FormGroup * parent, const rect_t & rect, ChoiceType type = CHOICE_TYPE_DROPOWN, WindowFlags windowFlags = 0):
FormField(parent, rect, windowFlags),
type(type)
{
}
@@ -46,7 +46,7 @@ class ChoiceBase : public FormField {
class Choice : public ChoiceBase {
public:
Choice(FormGroup * parent, const rect_t & rect, const char * values, int16_t vmin, int16_t vmax, std::function<int16_t()> getValue, std::function<void(int16_t)> setValue = nullptr);
Choice(FormGroup * parent, const rect_t & rect, const char * values, int16_t vmin, int16_t vmax, std::function<int16_t()> getValue, std::function<void(int16_t)> setValue = nullptr, WindowFlags windowFlags = 0);
#if defined(DEBUG_WINDOWS)
std::string getName() override