File melonds_PR1971.patch of Package melonds

Overview Repositories Revisions Requests Users Attributes Meta

File melonds_PR1971.patch of Package melonds

From 392e1f21ff0a299ba072aaa677a14eb62ddbb34d Mon Sep 17 00:00:00 2001
From: VitorMM <vitor251093@gmail.com>
Date: Mon, 5 Feb 2024 20:35:34 -0300
Subject: [PATCH] Auto screen sizing should work again

---
 src/frontend/qt_sdl/EmuThread.cpp | 1 -
 src/frontend/qt_sdl/EmuThread.h   | 4 ++--
 src/frontend/qt_sdl/Screen.cpp    | 2 +-
 src/frontend/qt_sdl/main.cpp      | 2 --
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/frontend/qt_sdl/EmuThread.cpp b/src/frontend/qt_sdl/EmuThread.cpp
index 0728a0856a..53dc37ea78 100644
--- a/src/frontend/qt_sdl/EmuThread.cpp
+++ b/src/frontend/qt_sdl/EmuThread.cpp
@@ -67,7 +67,6 @@ using namespace melonDS;
 // TEMP
 extern bool RunningSomething;
 extern MainWindow* mainWindow;
-extern int autoScreenSizing;
 extern int videoRenderer;
 extern bool videoSettingsDirty;
 
diff --git a/src/frontend/qt_sdl/EmuThread.h b/src/frontend/qt_sdl/EmuThread.h
index 4950ebbf62..daa189ebf6 100644
--- a/src/frontend/qt_sdl/EmuThread.h
+++ b/src/frontend/qt_sdl/EmuThread.h
@@ -29,6 +29,8 @@
 #include "NDSCart.h"
 #include "GBACart.h"
 
+extern int autoScreenSizing;
+
 using Keep = std::monostate;
 using UpdateConsoleNDSArgs = std::variant<Keep, std::unique_ptr<melonDS::NDSCart::CartCommon>>;
 using UpdateConsoleGBAArgs = std::variant<Keep, std::unique_ptr<melonDS::GBACart::CartCommon>>;
@@ -125,8 +127,6 @@ class EmuThread : public QThread
 
     ScreenPanelGL* screenGL;
 
-    int autoScreenSizing;
-
     int videoRenderer;
     bool videoSettingsDirty;
 };
diff --git a/src/frontend/qt_sdl/Screen.cpp b/src/frontend/qt_sdl/Screen.cpp
index cfcbeed91c..1660b1813f 100644
--- a/src/frontend/qt_sdl/Screen.cpp
+++ b/src/frontend/qt_sdl/Screen.cpp
@@ -60,13 +60,13 @@ using namespace melonDS;
 extern MainWindow* mainWindow;
 extern EmuThread* emuThread;
 extern bool RunningSomething;
-extern int autoScreenSizing;
 
 extern int videoRenderer;
 extern bool videoSettingsDirty;
 
 const u32 kOSDMargin = 6;
 
+int autoScreenSizing;
 
 ScreenPanel::ScreenPanel(QWidget* parent) : QWidget(parent)
 {
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 3a5c1a11e0..07c437c317 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -163,8 +163,6 @@ bool RunningSomething;
 MainWindow* mainWindow;
 EmuThread* emuThread;
 
-int autoScreenSizing = 0;
-
 int videoRenderer;
 bool videoSettingsDirty;

Places

File melonds_PR1971.patch of Package melonds

Places