[nostalgia/core/studio] Increase max tilesheet export size, fix input handling when popups open

src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp

@@ -109,8 +109,9 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key key, bool down) {
 		m_subsheetEditor.close();
 		m_exportMenu.close();
 	}
-	auto pal = m_model.pal();
-	if (pal) {
+	auto const popupOpen = m_subsheetEditor.isOpen() && m_exportMenu.isOpen();
+	auto const pal = m_model.pal();
+	if (pal && !popupOpen) {
 		const auto colorCnt = pal->colors.size();
 		if (key == turbine::Key::Alpha_D) {
 			m_tool = Tool::Draw;
@@ -496,7 +497,7 @@ void TileSheetEditorImGui::ExportMenu::draw() noexcept {
 	ImGui::SetNextWindowSize(ImVec2(235, popupHeight));
 	if (ImGui::BeginPopupModal(popupName, &m_show, modalFlags)) {
 		ImGui::InputInt("Scale", &m_scale);
-		m_scale = ox::clamp(m_scale, 1, 20);
+		m_scale = ox::clamp(m_scale, 1, 50);
 		if (ImGui::Button("OK", ImVec2{50, 20})) {
 			ImGui::CloseCurrentPopup();
 			m_show = false;

src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp

@@ -41,6 +41,8 @@ class TileSheetEditorImGui: public studio::Editor {
 				}
 				void draw() noexcept;
 				void close() noexcept;
+				[[nodiscard]]
+				inline bool isOpen() const noexcept { return m_show; }
 		};
 		class ExportMenu {
 			int m_scale = 0;
@@ -53,6 +55,8 @@ class TileSheetEditorImGui: public studio::Editor {
 				}
 				void draw() noexcept;
 				void close() noexcept;
+				[[nodiscard]]
+				inline bool isOpen() const noexcept { return m_show; }
 		};
 		std::size_t m_selectedPaletteIdx = 0;
 		turbine::Context &m_ctx;

src/nostalgia/studio/CMakeLists.txt

@@ -9,6 +9,11 @@ target_link_libraries(
 		OlympicApplib
 )
 
+target_compile_definitions(
+	NostalgiaStudio PUBLIC
+		OLYMPIC_APP_VERSION="2023.12.0"
+)
+
 install(
 	TARGETS
 		NostalgiaStudio

src/olympic/applib/applib.cpp

@@ -13,6 +13,10 @@
 #define OLYMPIC_APP_NAME "App"
 #endif
 
+#ifndef OLYMPIC_APP_VERSION
+#define OLYMPIC_APP_VERSION "dev build"
+#endif
+
 #ifndef OLYMPIC_PROJECT_NAMESPACE
 #define OLYMPIC_PROJECT_NAMESPACE project
 #endif
@@ -31,6 +35,8 @@
 
 namespace olympic {
 
+ox::String s_version = ox::String(OLYMPIC_APP_VERSION);
+
 ox::Error run(
 		ox::StringView project,
 		ox::StringView appName,

src/olympic/studio/applib/src/aboutpopup.cpp

@@ -7,10 +7,14 @@
 #include <studio/imguiuitl.hpp>
 #include "aboutpopup.hpp"
 
+namespace olympic {
+extern ox::String s_version;
+}
+
 namespace studio {
 
 AboutPopup::AboutPopup(turbine::Context &ctx) noexcept {
-	m_text = ox::sfmt("{} - dev build", keelCtx(ctx).appName);
+	m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::s_version);
 }
 
 void AboutPopup::open() noexcept {