piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 15:19:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

a bit of refactoring around ScreenHandler

Browse Source 
also gets rid of that annoying warning about const char* being converted to char*
This commit is contained in:
RSDuck
2022-08-05 20:22:10 +02:00
parent 2ba7f961a6
commit 5baf5fe77b
3 changed files with 41 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontend/qt_sdl/main.h
View File

@ -101,7 +101,8 @@ class ScreenHandler
Q_GADGET
public:
virtual ~ScreenHandler() {}
ScreenHandler(QWidget* widget);
virtual ~ScreenHandler();
QTimer* setupMouseTimer();
void updateMouseTimer();
QTimer* mouseTimer;
@ -121,7 +122,7 @@ protected:
int screenKind[Frontend::MaxScreenTransforms];
int numScreens;
bool touching;
bool touching = false;
void showCursor();
};
@ -133,7 +134,7 @@ class ScreenPanelNative : public QWidget, public ScreenHandler
public:
explicit ScreenPanelNative(QWidget* parent);
~ScreenPanelNative();
virtual ~ScreenPanelNative();
protected:
void paintEvent(QPaintEvent* event) override;
@ -163,7 +164,7 @@ class ScreenPanelGL : public QOpenGLWidget, public ScreenHandler, protected QOpe
public:
explicit ScreenPanelGL(QWidget* parent);
~ScreenPanelGL();
virtual ~ScreenPanelGL();
protected:
void initializeGL() override;
@ -316,9 +317,8 @@ private:
bool oldMax;
public:
QWidget* panel;
ScreenPanelGL* panelGL;
ScreenPanelNative* panelNative;
ScreenHandler* panel;
QWidget* panelWidget;
QAction* actOpenROM;
QAction* actBootFirmware;