[nostalgia/studio] Set version to d2025.05.0

deps/ox/src/ox/std/string.hpp

@@ -213,22 +213,22 @@ class BasicString {
 
 		[[nodiscard]]
 		constexpr const char *c_str() const noexcept {
-			return static_cast<const char*>(m_buff.data());
+			return m_buff.data();
 		}
 
 		[[nodiscard]]
-		inline explicit operator const char*() const {
+		constexpr explicit operator const char*() const {
 			return c_str();
 		}
 
 #if __has_include(<string>)
 		[[nodiscard]]
-		inline std::string toStdString() const {
+		std::string toStdString() const {
 			return c_str();
 		}
 
 		[[nodiscard]]
-		inline explicit operator std::string() const {
+		explicit operator std::string() const {
 			return c_str();
 		}
 #endif

release-notes.md

@@ -1,13 +1,16 @@
 # d2025.05.0
 
 * Add app icon for both window and file
+* Change application font to Roboto Medium
 * Closing application will now confirm with user if any files have unsaved
   changes.
 * UUID duplicates will now be reported when opening a project
 * Deleting a directory now closes files in that directory
 * Delete key now initiates deletion of selected directory
+* Remove ability to re-order tabs. There were bugs associated with that.
 * TileSheetEditor: Fix selection clearing in to work when clicking outside
   image.
+* TileSheetEditor: Fix Delete Tile functionality, which was completely broken
 * PaletteEditor: Fix color number key range in. Previously, pressing A caused
   the editor to jump to the last color.
 * PaletteEditor: page rename will now take effect upon pressing enter if the

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/deletetilescommand.cpp

@@ -8,14 +8,14 @@
 
 namespace nostalgia::gfx {
 
-gfx::DeleteTilesCommand::DeleteTilesCommand(
+DeleteTilesCommand::DeleteTilesCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
-		std::size_t tileIdx,
-		std::size_t tileCnt) noexcept:
+		std::size_t const tileIdx,
+		std::size_t const tileCnt) noexcept:
 		m_img(img),
 		m_idx(std::move(idx)) {
-	const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile;
+	constexpr unsigned bytesPerTile = PixelsPerTile;
 	m_deletePos = tileIdx * bytesPerTile;
 	m_deleteSz = tileCnt * bytesPerTile;
 	m_deletedPixels.resize(m_deleteSz);
@@ -28,16 +28,20 @@ gfx::DeleteTilesCommand::DeleteTilesCommand(
 	}
 }
 
-ox::Error gfx::DeleteTilesCommand::redo() noexcept {
+ox::Error DeleteTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
-	auto srcPos = m_deletePos + m_deleteSz;
-	auto const src = &p[srcPos];
+	auto const srcPos = m_deletePos + m_deleteSz;
 	auto const dst1 = &p[m_deletePos];
 	auto const dst2 = &p[(p.size() - m_deleteSz)];
 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	ox::memmove(dst1, src, p.size() - srcPos);
-	ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
+	if (srcPos < p.size()) {
+		auto const src = &p[srcPos];
+		ox::memmove(dst1, src, p.size() - srcPos);
+		ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
+	} else {
+		ox::memset(dst1, 0, p.size() - m_deletePos);
+	}
 	OX_ALLOW_UNSAFE_BUFFERS_END
 	return {};
 }
@@ -46,11 +50,14 @@ ox::Error DeleteTilesCommand::undo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
 	auto const src = &p[m_deletePos];
-	auto const dst1 = &p[m_deletePos + m_deleteSz];
-	auto const dst2 = src;
 	auto const sz = p.size() - m_deletePos - m_deleteSz;
+	auto const srcPos = m_deletePos + m_deleteSz;
 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	ox::memmove(dst1, src, sz);
+	if (srcPos < p.size()) {
+		auto const dst1 = &p[m_deletePos + m_deleteSz];
+		ox::memmove(dst1, src, sz);
+	}
+	auto const dst2 = src;
 	ox::memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
 	OX_ALLOW_UNSAFE_BUFFERS_END
 	return {};

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/inserttilescommand.cpp

@@ -9,20 +9,19 @@ namespace nostalgia::gfx {
 InsertTilesCommand::InsertTilesCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
-		std::size_t tileIdx,
-		std::size_t tileCnt) noexcept:
-		m_img(img),
-		m_idx(std::move(idx)) {
-	const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile;
-	m_insertPos = tileIdx * bytesPerTile;
-	m_insertCnt = tileCnt * bytesPerTile;
+		std::size_t const tileIdx,
+		std::size_t const tileCnt) noexcept:
+		m_img{img},
+		m_idx{std::move(idx)} {
+	m_insertPos = tileIdx * PixelsPerTile;
+	m_insertCnt = tileCnt * PixelsPerTile;
 	m_deletedPixels.resize(m_insertCnt);
 	// copy pixels to be erased
 	{
 		auto &s = getSubSheet(m_img, m_idx);
 		auto &p = s.pixels;
-		auto dst = m_deletedPixels.begin();
-		auto src = p.begin() + p.size() - m_insertCnt;
+		auto const dst = m_deletedPixels.begin();
+		auto const src = p.begin() + p.size() - m_insertCnt;
 		ox::copy_n(src, m_insertCnt, dst);
 	}
 }
@@ -32,7 +31,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 ox::Error InsertTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
-	auto dstPos = m_insertPos + m_insertCnt;
+	auto const dstPos = m_insertPos + m_insertCnt;
 	auto const src = &p[m_insertPos];
 	if (dstPos < p.size()) {
 		auto const dst = &p[dstPos];

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp

@@ -6,7 +6,7 @@
 
 namespace nostalgia::gfx {
 
-gfx::UpdateSubSheetCommand::UpdateSubSheetCommand(
+UpdateSubSheetCommand::UpdateSubSheetCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
 		ox::StringParam name,

src/nostalgia/studio/CMakeLists.txt

@@ -15,7 +15,7 @@ target_link_libraries(
 
 target_compile_definitions(
 	NostalgiaStudio PUBLIC
-		OLYMPIC_APP_VERSION="dev build"
+		OLYMPIC_APP_VERSION="d2025.05.0"
 )
 
 install(

src/nostalgia/studio/Info.plist

@@ -18,7 +18,7 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>dev build</string>
+	<string>d2025.05.0</string>
 
 	<key>LSMinimumSystemVersion</key>
 	<string>12.0.0</string>

src/olympic/keel/include/keel/context.hpp

@@ -12,8 +12,6 @@
 
 namespace keel {
 
-class Context;
-
 class Context {
 	public:
 		ox::UPtr<ox::FileSystem> rom;

src/olympic/keel/src/media.cpp

@@ -182,7 +182,7 @@ ox::Result<ox::CStringView> uuidToPath(Context &ctx, ox::UUID const&uuid) noexce
 #endif
 }
 
-ox::Error reloadAsset(keel::Context &ctx, ox::StringViewCR assetId) noexcept {
+ox::Error reloadAsset(Context &ctx, ox::StringViewCR assetId) noexcept {
 	if (beginsWith(assetId, "uuid://")) {
 		return ctx.assetManager.reloadAsset(substr(assetId, 7));
 	} else {

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

@@ -13,22 +13,10 @@ extern ox::String appVersion;
 
 namespace studio {
 
-AboutPopup::AboutPopup(turbine::Context &ctx) noexcept {
+AboutPopup::AboutPopup(turbine::Context &ctx) noexcept: Popup("About") {
 	m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion);
 }
 
-void AboutPopup::open() noexcept {
-	m_stage = Stage::Opening;
-}
-
-void AboutPopup::close() noexcept {
-	m_stage = Stage::Closed;
-}
-
-bool AboutPopup::isOpen() const noexcept {
-	return m_stage == Stage::Open;
-}
-
 void AboutPopup::draw(Context &sctx) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
@@ -47,7 +35,7 @@ void AboutPopup::draw(Context &sctx) noexcept {
 			ig::centerNextWindow(sctx.tctx);
 			auto open = true;
 			if (ImGui::BeginPopupModal("About", &open, modalFlags)) {
-				ImGui::Text("%s", m_text.c_str());
+				ImGui::Text("%s\n\nBuild date: %s", m_text.c_str(), __DATE__);
 				ImGui::NewLine();
 				ImGui::Dummy({148.0f, 0.0f});
 				ImGui::SameLine();

src/olympic/studio/applib/src/aboutpopup.hpp

@@ -13,29 +13,14 @@
 
 namespace studio {
 
-class AboutPopup: public studio::Popup {
-	public:
-		enum class Stage {
-			Closed,
-			Opening,
-			Open,
-		};
-
+class AboutPopup final: public ig::Popup {
 	private:
-		Stage m_stage = Stage::Closed;
 		ox::String m_text;
 
 	public:
 		explicit AboutPopup(turbine::Context &ctx) noexcept;
 
-		void open() noexcept override;
-
-		void close() noexcept override;
-
-		[[nodiscard]]
-		bool isOpen() const noexcept override;
-
-		void draw(studio::Context &sctx) noexcept override;
+		void draw(Context &sctx) noexcept override;
 
 };
 

src/olympic/studio/applib/src/studioui.cpp

@@ -65,10 +65,7 @@ OX_MODEL_END()
 StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexcept:
 		m_sctx{*this, ctx},
 		m_tctx{ctx},
-		m_projectDataDir{std::move(projectDataDir)},
-		m_projectExplorer{keelCtx(m_tctx)},
-		m_newProject{m_projectDataDir},
-		m_aboutPopup{m_tctx} {
+		m_projectDataDir{std::move(projectDataDir)} {
 	{
 		ImFontConfig fontCfg;
 		fontCfg.FontDataOwnedByAtlas = false;
@@ -255,7 +252,7 @@ void StudioUI::drawMenu() noexcept {
 void StudioUI::drawTabBar() noexcept {
 	auto const viewport = ImGui::GetContentRegionAvail();
 	ImGui::BeginChild("TabWindow##MainWindow##Studio", ImVec2(viewport.x, viewport.y));
-	constexpr auto tabBarFlags = ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_TabListPopupButton;
+	constexpr auto tabBarFlags = ImGuiTabBarFlags_TabListPopupButton;
 	if (ImGui::BeginTabBar("TabBar##TabWindow##MainWindow##Studio", tabBarFlags)) {
 		drawTabs();
 		ImGui::EndTabBar();

src/olympic/studio/applib/src/studioui.hpp

@@ -36,7 +36,7 @@ class StudioUI: public ox::SignalHandler {
 		TaskRunner m_taskRunner;
 		ox::Vector<ox::UPtr<BaseEditor>> m_editors;
 		ox::HashMap<ox::String, EditorMaker::Func> m_editorMakers;
-		ProjectExplorer m_projectExplorer;
+		ProjectExplorer m_projectExplorer{keelCtx(m_tctx)};
 		ox::Vector<ox::String> m_openFiles;
 		BaseEditor *m_activeEditorOnLastDraw = nullptr;
 		BaseEditor *m_activeEditor = nullptr;
@@ -45,6 +45,7 @@ class StudioUI: public ox::SignalHandler {
 		ox::Vector<ox::Pair<ox::String>> m_queuedMoves;
 		ox::Vector<ox::Pair<ox::String>> m_queuedDirMoves;
 		NewMenu m_newMenu{keelCtx(m_tctx)};
+		AboutPopup m_aboutPopup{m_tctx};
 		DeleteConfirmation m_deleteConfirmation;
 		NewDir m_newDirDialog;
 		ig::QuestionPopup m_closeFileConfirm{"Close File?", "This file has unsaved changes. Close?"};
@@ -55,8 +56,7 @@ class StudioUI: public ox::SignalHandler {
 		ig::MessagePopup m_messagePopup{"Message", ""};
 		MakeCopyPopup m_copyFilePopup;
 		RenameFile m_renameFile;
-		NewProject m_newProject;
-		AboutPopup m_aboutPopup;
+		NewProject m_newProject{m_projectDataDir};
 		ox::Array<Widget*, 10> const m_widgets {
 			&m_closeFileConfirm,
 			&m_closeAppConfirm,

util/scripts/pkg-dmg.py

@@ -34,3 +34,4 @@ mkdir_p(dmg_dir)
 shutil.copytree('dist/darwin-arm64-release/NostalgiaStudio.app', f'{dmg_dir}/NostalgiaStudio.app')
 os.symlink('/Applications', f'{dmg_dir}/Applications')
 run(['hdiutil', 'create', '-srcfolder', dmg_dir, dmg])
+rm(dmg_dir)