morgan/OMOTE
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Update SDLDisplay so it finds the window based on events that way it works on windows and Ubuntu

Browse source
This commit is contained in:
MatthewColvin 2023-10-10 13:37:16 -05:00
parent af7abe115f
commit ddbfc13e55
2 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Platformio/HAL/Targets/Simulator/SDLDisplay.cpp
View file

@ -2,38 +2,38 @@
#include "sdl/sdl.h"
#include <string>
std::shared_ptr<SDLDisplay> SDLDisplay::getInstance(){
if (!DisplayAbstract::mInstance){
std::shared_ptr<SDLDisplay> SDLDisplay::getInstance() {
if (!DisplayAbstract::mInstance) {
DisplayAbstract::mInstance = std::shared_ptr<SDLDisplay>(new SDLDisplay());
}
return std::static_pointer_cast<SDLDisplay>(mInstance);
}
void SDLDisplay::setBrightness(uint8_t brightness){
mBrightness = brightness;
void SDLDisplay::setBrightness(uint8_t brightness) { mBrightness = brightness; }
uint8_t SDLDisplay::getBrightness() { return mBrightness; }
void SDLDisplay::turnOff() {}
void SDLDisplay::flushDisplay(lv_disp_drv_t *disp, const lv_area_t *area,
lv_color_t *color_p) {
sdl_display_flush(disp, area, color_p);
}
uint8_t SDLDisplay::getBrightness(){
return mBrightness;
void SDLDisplay::screenInput(lv_indev_drv_t *indev_driver,
lv_indev_data_t *data) {
sdl_mouse_read(indev_driver, data);
}
void SDLDisplay::turnOff(){
void SDLDisplay::setTitle(std::string aNewTitle) {
SDL_SetWindowTitle(mSimWindow, aNewTitle.c_str());
}
void SDLDisplay::flushDisplay(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p){
sdl_display_flush(disp,area,color_p);
}
void SDLDisplay::screenInput(lv_indev_drv_t *indev_driver, lv_indev_data_t *data){
sdl_mouse_read(indev_driver,data);
}
void SDLDisplay::setTitle(std::string aNewTitle){
SDL_SetWindowTitle(mSimWindow,aNewTitle.c_str());
}
SDLDisplay::SDLDisplay(): DisplayAbstract() {
SDLDisplay::SDLDisplay() : DisplayAbstract() {
sdl_init();
mSimWindow = SDL_GetWindowFromID(1); // Get the SDL window via ID hopefully it is always 1...
// Get the SDL window via an event
SDL_Event aWindowIdFinder;
SDL_PollEvent(&aWindowIdFinder);
mSimWindow = SDL_GetWindowFromID(aWindowIdFinder.window.windowID);
}

14
Platformio/HAL/Targets/Simulator/SDLDisplay.hpp
View file

@ -1,9 +1,9 @@
#pragma once
#include <stdint.h>
#include "SDL2/SDL.h"
#include "DisplayAbstract.h"
#include "SDL2/SDL.h"
#include <stdint.h>
class SDLDisplay : public DisplayAbstract{
class SDLDisplay : public DisplayAbstract {
public:
static std::shared_ptr<SDLDisplay> getInstance();
@ -15,11 +15,13 @@ public:
void setTitle(std::string aNewTitle);
protected:
virtual void flushDisplay(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p) override;
virtual void screenInput(lv_indev_drv_t *indev_driver, lv_indev_data_t *data) override;
virtual void flushDisplay(lv_disp_drv_t *disp, const lv_area_t *area,
lv_color_t *color_p) override;
virtual void screenInput(lv_indev_drv_t *indev_driver,
lv_indev_data_t *data) override;
private:
SDLDisplay();
uint8_t mBrightness;
SDL_Window* mSimWindow;
SDL_Window *mSimWindow;
};