Update to latest libopenui
This commit is contained in:
+6
-4
@@ -25,7 +25,8 @@ constexpr WindowFlags BUTTON_BACKGROUND = FORM_FLAGS_LAST << 1u;
|
||||
constexpr WindowFlags BUTTON_CHECKED = FORM_FLAGS_LAST << 2u;
|
||||
constexpr WindowFlags BUTTON_CHECKED_ON_FOCUS = FORM_FLAGS_LAST << 3u;
|
||||
|
||||
class Button: public FormField {
|
||||
class Button: public FormField
|
||||
{
|
||||
public:
|
||||
Button(FormGroup * parent, const rect_t & rect, std::function<uint8_t(void)> pressHandler = nullptr, WindowFlags windowFlags = 0):
|
||||
FormField(parent, rect, windowFlags),
|
||||
@@ -83,7 +84,8 @@ class Button: public FormField {
|
||||
void onPress();
|
||||
};
|
||||
|
||||
class TextButton: public Button {
|
||||
class TextButton: public Button
|
||||
{
|
||||
public:
|
||||
TextButton(FormGroup * parent, const rect_t & rect, std::string text, std::function<uint8_t(void)> pressHandler = nullptr, WindowFlags windowFlags = BUTTON_BACKGROUND):
|
||||
Button(parent, rect, std::move(pressHandler), windowFlags | OPAQUE),
|
||||
@@ -112,7 +114,8 @@ class TextButton: public Button {
|
||||
std::string text;
|
||||
};
|
||||
|
||||
class IconButton: public Button {
|
||||
class IconButton: public Button
|
||||
{
|
||||
public:
|
||||
IconButton(FormGroup * parent, const rect_t & rect, uint8_t icon, std::function<uint8_t(void)> pressHandler, WindowFlags flags = 0):
|
||||
Button(parent, rect, std::move(pressHandler), flags),
|
||||
@@ -132,4 +135,3 @@ class IconButton: public Button {
|
||||
protected:
|
||||
uint8_t icon;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user