handle mouse events
Signed-off-by: Peter Siegmund <developer@mars3142.org>
This commit is contained in:
@@ -3,13 +3,14 @@
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
#include "u8g2.h"
|
||||
#include "common/Widget.h"
|
||||
#include "u8g2.h"
|
||||
|
||||
class Widget;
|
||||
|
||||
typedef struct {
|
||||
u8g2_t* u8g2;
|
||||
typedef struct
|
||||
{
|
||||
u8g2_t *u8g2;
|
||||
|
||||
std::function<void(std::shared_ptr<Widget>)> setScreen;
|
||||
std::function<void(std::shared_ptr<Widget>)> pushScreen;
|
||||
|
@@ -8,19 +8,20 @@
|
||||
|
||||
typedef std::function<void(uint8_t)> MenuCallback;
|
||||
|
||||
class PSMenu : public Widget {
|
||||
public:
|
||||
explicit PSMenu(menu_options_t* options);
|
||||
class PSMenu : public Widget
|
||||
{
|
||||
public:
|
||||
explicit PSMenu(menu_options_t *options);
|
||||
~PSMenu() override;
|
||||
|
||||
void render() override;
|
||||
void onButtonClicked(uint8_t button) override;
|
||||
|
||||
void addText(const std::string& text, const MenuCallback& callback);
|
||||
void addSwitch(const std::string& text, std::string& value, const MenuCallback& callback);
|
||||
void addNumber(const std::string& text, std::string& value, const MenuCallback& callback);
|
||||
void addText(const std::string &text, const MenuCallback &callback);
|
||||
void addSwitch(const std::string &text, std::string &value, const MenuCallback &callback);
|
||||
void addNumber(const std::string &text, std::string &value, const MenuCallback &callback);
|
||||
|
||||
private:
|
||||
private:
|
||||
void onPressedDown();
|
||||
void onPressedUp();
|
||||
void onPressedLeft();
|
||||
|
@@ -3,13 +3,14 @@
|
||||
#include "MenuOptions.h"
|
||||
#include "Widget.h"
|
||||
|
||||
class ScrollBar final : public Widget {
|
||||
public:
|
||||
class ScrollBar final : public Widget
|
||||
{
|
||||
public:
|
||||
ScrollBar(const menu_options_t *options, size_t x, size_t y, size_t width, size_t height);
|
||||
void render() override;
|
||||
void refresh(size_t value, size_t max, size_t min = 0);
|
||||
|
||||
private:
|
||||
private:
|
||||
size_t m_x;
|
||||
size_t m_y;
|
||||
size_t m_width;
|
||||
|
@@ -4,9 +4,10 @@
|
||||
|
||||
#include "u8g2.h"
|
||||
|
||||
class Widget {
|
||||
public:
|
||||
explicit Widget(u8g2_t* u8g2);
|
||||
class Widget
|
||||
{
|
||||
public:
|
||||
explicit Widget(u8g2_t *u8g2);
|
||||
|
||||
virtual ~Widget() = default;
|
||||
|
||||
@@ -16,6 +17,6 @@ public:
|
||||
|
||||
virtual void onButtonClicked(uint8_t button);
|
||||
|
||||
protected:
|
||||
u8g2_t* u8g2;
|
||||
protected:
|
||||
u8g2_t *u8g2;
|
||||
};
|
||||
|
@@ -4,14 +4,11 @@
|
||||
#include <functional>
|
||||
#include <string>
|
||||
|
||||
class MenuItem {
|
||||
public:
|
||||
class MenuItem
|
||||
{
|
||||
public:
|
||||
MenuItem(uint8_t type, std::string text, std::function<void(uint8_t)> callback);
|
||||
MenuItem(
|
||||
uint8_t type,
|
||||
std::string text,
|
||||
std::string value,
|
||||
std::function<void(uint8_t)> callback);
|
||||
MenuItem(uint8_t type, std::string text, std::string value, std::function<void(uint8_t)> callback);
|
||||
[[nodiscard]] uint8_t getType() const;
|
||||
[[nodiscard]] const std::string &getText() const;
|
||||
[[nodiscard]] const std::string &getValue() const;
|
||||
@@ -19,7 +16,7 @@ public:
|
||||
void callback(uint8_t id) const;
|
||||
[[nodiscard]] bool hasCallback() const;
|
||||
|
||||
private:
|
||||
private:
|
||||
uint8_t m_type;
|
||||
std::string m_text;
|
||||
std::string m_value;
|
||||
|
@@ -4,6 +4,6 @@
|
||||
|
||||
class LightMenu : public PSMenu
|
||||
{
|
||||
public:
|
||||
explicit LightMenu(menu_options_t* options);
|
||||
public:
|
||||
explicit LightMenu(menu_options_t *options);
|
||||
};
|
||||
|
@@ -2,12 +2,13 @@
|
||||
|
||||
#include "common/PSMenu.h"
|
||||
|
||||
class MainMenu final : public PSMenu {
|
||||
public:
|
||||
explicit MainMenu(menu_options_t* options);
|
||||
class MainMenu final : public PSMenu
|
||||
{
|
||||
public:
|
||||
explicit MainMenu(menu_options_t *options);
|
||||
|
||||
private:
|
||||
private:
|
||||
void onSelect(uint8_t id) const;
|
||||
|
||||
menu_options_t* m_options;
|
||||
menu_options_t *m_options;
|
||||
};
|
||||
|
@@ -4,6 +4,6 @@
|
||||
|
||||
class SettingsMenu : public PSMenu
|
||||
{
|
||||
public:
|
||||
explicit SettingsMenu(menu_options_t* options) ;
|
||||
public:
|
||||
explicit SettingsMenu(menu_options_t *options);
|
||||
};
|
||||
|
@@ -3,12 +3,13 @@
|
||||
#include "MenuOptions.h"
|
||||
#include "common/Widget.h"
|
||||
|
||||
class SplashScreen final : public Widget {
|
||||
public:
|
||||
explicit SplashScreen(menu_options_t* options);
|
||||
class SplashScreen final : public Widget
|
||||
{
|
||||
public:
|
||||
explicit SplashScreen(menu_options_t *options);
|
||||
void update(uint64_t dt) override;
|
||||
void render() override;
|
||||
|
||||
private:
|
||||
menu_options_t* m_options;
|
||||
private:
|
||||
menu_options_t *m_options;
|
||||
};
|
||||
|
Reference in New Issue
Block a user