From e723ead864edb4bc160e4d69713309174ad9e82e Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 22 Feb 2025 20:55:17 -0600
Subject: [PATCH] Squashed 'deps/nostalgia/' changes from fbebf4ef..472f5702

472f5702 [nostalgia/gfx/studio/tilesheet] Change max export scale to 135
c0ac4345 [studio] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: 472f5702bde8b6d4fc789a81283ff899cac181ea
---
 .../gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp  | 2 +-
 src/olympic/studio/applib/src/CMakeLists.txt                  | 4 ++--
 src/olympic/studio/applib/src/{main.cpp => app.cpp}           | 3 +--
 src/olympic/studio/applib/src/{studioapp.cpp => studioui.cpp} | 2 +-
 src/olympic/studio/applib/src/{studioapp.hpp => studioui.hpp} | 0
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename src/olympic/studio/applib/src/{main.cpp => app.cpp} (96%)
 rename src/olympic/studio/applib/src/{studioapp.cpp => studioui.cpp} (99%)
 rename src/olympic/studio/applib/src/{studioapp.hpp => studioui.hpp} (100%)

diff --git a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp
index 4809aa1..6e94845 100644
--- a/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp
+++ b/src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp
@@ -642,7 +642,7 @@ void TileSheetEditorImGui::ExportMenu::draw(turbine::Context &tctx) noexcept {
 	constexpr auto popupSz = ImVec2{popupWidth, popupHeight};
 	if (ig::BeginPopup(tctx, popupName, m_show, popupSz)) {
 		ImGui::InputInt("Scale", &m_scale);
-		m_scale = ox::clamp(m_scale, 1, 50);
+		m_scale = ox::clamp(m_scale, 1, 135);
 		if (ig::PopupControlsOkCancel(popupWidth, m_show) == ig::PopupResponse::OK) {
 			inputSubmitted.emit(m_scale);
 		}
diff --git a/src/olympic/studio/applib/src/CMakeLists.txt b/src/olympic/studio/applib/src/CMakeLists.txt
index 773f36c..f3d4865 100644
--- a/src/olympic/studio/applib/src/CMakeLists.txt
+++ b/src/olympic/studio/applib/src/CMakeLists.txt
@@ -1,17 +1,17 @@
 add_library(
 	StudioAppLib
 		aboutpopup.cpp
+		app.cpp
 		clawviewer.cpp
 		deleteconfirmation.cpp
 		filedialogmanager.cpp
-		main.cpp
 		makecopypopup.cpp
 		newdir.cpp
 		newmenu.cpp
 		newproject.cpp
 		projectexplorer.cpp
 		renamefile.cpp
-		studioapp.cpp
+		studioui.cpp
 )
 target_compile_definitions(
 	StudioAppLib PUBLIC
diff --git a/src/olympic/studio/applib/src/main.cpp b/src/olympic/studio/applib/src/app.cpp
similarity index 96%
rename from src/olympic/studio/applib/src/main.cpp
rename to src/olympic/studio/applib/src/app.cpp
index 440b070..9408119 100644
--- a/src/olympic/studio/applib/src/main.cpp
+++ b/src/olympic/studio/applib/src/app.cpp
@@ -11,8 +11,7 @@
 #include <turbine/turbine.hpp>
 
 #include <studio/context.hpp>
-#include <studioapp/studioapp.hpp>
-#include "studioapp.hpp"
+#include "studioui.hpp"
 
 namespace studio {
 
diff --git a/src/olympic/studio/applib/src/studioapp.cpp b/src/olympic/studio/applib/src/studioui.cpp
similarity index 99%
rename from src/olympic/studio/applib/src/studioapp.cpp
rename to src/olympic/studio/applib/src/studioui.cpp
index 6782603..a974444 100644
--- a/src/olympic/studio/applib/src/studioapp.cpp
+++ b/src/olympic/studio/applib/src/studioui.cpp
@@ -14,7 +14,7 @@
 #include <studio/configio.hpp>
 #include "clawviewer.hpp"
 #include "filedialogmanager.hpp"
-#include "studioapp.hpp"
+#include "studioui.hpp"
 
 namespace studio {
 
diff --git a/src/olympic/studio/applib/src/studioapp.hpp b/src/olympic/studio/applib/src/studioui.hpp
similarity index 100%
rename from src/olympic/studio/applib/src/studioapp.hpp
rename to src/olympic/studio/applib/src/studioui.hpp