From ef8b5b77a9b84aa0c8b3b24a2cbd197f2e55d494 Mon Sep 17 00:00:00 2001
From: Lorenzooone <lollo.lollo.rbiz@gmail.com>
Date: Sat, 22 Jun 2024 23:41:47 +0200
Subject: [PATCH] Try fixing macos fullscreen issues

---
 CMakeLists.txt                 |  7 ++++++-
 README.md                      |  1 -
 data/MacOSXBundleInfo.plist.in |  4 +++-
 source/WindowScreen.cpp        | 19 -------------------
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f4f85b..aa5f762 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,7 +184,12 @@ add_custom_command(
     VERBATIM
 )
 
-install(FILES ${CMAKE_SOURCE_DIR}/${OUTPUT_NAME}${FINAL_EXTENSION} LICENSE README.md DESTINATION .)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+install(TARGETS ${OUTPUT_NAME} DESTINATION .)
+else()
+install(FILES ${CMAKE_SOURCE_DIR}/${OUTPUT_NAME}${FINAL_EXTENSION} DESTINATION .)
+endif()
+install(FILES LICENSE README.md DESTINATION .)
 install(DIRECTORY "other licenses" DESTINATION .)
 if(WIN32)
     install(FILES openal32.dll DESTINATION .)
diff --git a/README.md b/README.md
index 7d08958..8bdc1b7 100755
--- a/README.md
+++ b/README.md
@@ -133,7 +133,6 @@ On Windows, the profiles can be found in the ".config/cc3dsfs" folder inside the
 - At startup, the audio may be unstable. It should fix itself, if you give it enough time.
 - If, at first, the connection to the 3DS/DS fails, reconnect the 3DS/DS and then try again. If that also doesn't work, try restarting the program. If that also doesn't work, try restarting the computer.
 - USB Hubs can be the cause of connection issues. If you're having problems, try checking whether the 3DS/DS connects fine or not without any other devices connected.
-- Fullscreen mode on MacOS may mistake the screen for being bigger than what it really is. Changing the resolution to the proper one of the screen in the _Resolution Settings_ under Video Settings will fix the issue.
 - Current font in use: OFL Sorts Mill Goudy TT
 - Enabling Slow Poll may slightly boost the FPS of the software, at the cost of an extremely slight decrease in frame latency, and slower reaction times of the software to key presses. Disabled by default (as when the FPS are greater than the CC's, it's not reccomended).
 - On MacOS, you may get a notice about the app being damaged. It's Apple quaranteening the app. To make it work, open a terminal and run the following:
diff --git a/data/MacOSXBundleInfo.plist.in b/data/MacOSXBundleInfo.plist.in
index 724223f..7631355 100644
--- a/data/MacOSXBundleInfo.plist.in
+++ b/data/MacOSXBundleInfo.plist.in
@@ -25,7 +25,9 @@
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>NSHighResolutionCapable</key>
-	<true/>
+	<false/>
+	<key>NSHighResolutionMagnifyAllowed</key>
+	<false/>
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 </dict>
diff --git a/source/WindowScreen.cpp b/source/WindowScreen.cpp
index fc7bfad..44d5178 100755
--- a/source/WindowScreen.cpp
+++ b/source/WindowScreen.cpp
@@ -3,9 +3,6 @@
 #include <cstring>
 #include "font_ttf.h"
 
-#define DEFAULT_FS_WIDTH 1920
-#define DEFAULT_FS_HEIGHT 1080
-
 #define LEFT_ROUNDED_PADDING 5
 #define RIGHT_ROUNDED_PADDING 5
 #define TOP_ROUNDED_PADDING 0
@@ -765,22 +762,6 @@ void WindowScreen::create_window(bool re_prepare_size) {
 				success = true;
 			}
 		}
-		#ifdef __APPLE__
-		if(!success) {
-			sf::VideoMode mode_created = sf::VideoMode(DEFAULT_FS_WIDTH, DEFAULT_FS_HEIGHT, 32);
-			if(mode_created.isValid()) {
-				this->curr_desk_mode = mode_created;
-				success = true;
-			}
-			else {
-				mode_created = sf::VideoMode(DEFAULT_FS_WIDTH, DEFAULT_FS_HEIGHT, 24);
-				if(mode_created.isValid()) {
-					this->curr_desk_mode = mode_created;
-					success = true;
-				}
-			}
-		}
-		#endif
 		if(!success) {
 			this->curr_desk_mode = sf::VideoMode::getDesktopMode();
 		}