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

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

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

@@ -28,7 +28,7 @@ DeleteTilesCommand::DeleteTilesCommand(
 	}
 }
 
-ox::Error DeleteTilesCommand::redo() noexcept {
+ox::Error gfx::DeleteTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
 	auto const srcPos = m_deletePos + m_deleteSz;

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

@@ -9,19 +9,20 @@ namespace nostalgia::gfx {
 InsertTilesCommand::InsertTilesCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
-		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;
+		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;
 	m_deletedPixels.resize(m_insertCnt);
 	// copy pixels to be erased
 	{
 		auto &s = getSubSheet(m_img, m_idx);
 		auto &p = s.pixels;
-		auto const dst = m_deletedPixels.begin();
-		auto const src = p.begin() + p.size() - m_insertCnt;
+		auto dst = m_deletedPixels.begin();
+		auto src = p.begin() + p.size() - m_insertCnt;
 		ox::copy_n(src, m_insertCnt, dst);
 	}
 }
@@ -31,7 +32,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 ox::Error InsertTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
-	auto const dstPos = m_insertPos + m_insertCnt;
+	auto 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 {
 
-UpdateSubSheetCommand::UpdateSubSheetCommand(
+gfx::UpdateSubSheetCommand::UpdateSubSheetCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
 		ox::StringParam name,

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

@@ -13,10 +13,22 @@ extern ox::String appVersion;
 
 namespace studio {
 
-AboutPopup::AboutPopup(turbine::Context &ctx) noexcept: Popup("About") {
+AboutPopup::AboutPopup(turbine::Context &ctx) noexcept {
 	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();
@@ -35,7 +47,7 @@ void AboutPopup::draw(Context &sctx) noexcept {
 			ig::centerNextWindow(sctx.tctx);
 			auto open = true;
 			if (ImGui::BeginPopupModal("About", &open, modalFlags)) {
-				ImGui::Text("%s\n\nBuild date: %s", m_text.c_str(), __DATE__);
+				ImGui::Text("%s", m_text.c_str());
 				ImGui::NewLine();
 				ImGui::Dummy({148.0f, 0.0f});
 				ImGui::SameLine();

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

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

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

@@ -65,7 +65,10 @@ 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_projectDataDir{std::move(projectDataDir)},
+		m_projectExplorer{keelCtx(m_tctx)},
+		m_newProject{m_projectDataDir},
+		m_aboutPopup{m_tctx} {
 	{
 		ImFontConfig fontCfg;
 		fontCfg.FontDataOwnedByAtlas = false;

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{keelCtx(m_tctx)};
+		ProjectExplorer m_projectExplorer;
 		ox::Vector<ox::String> m_openFiles;
 		BaseEditor *m_activeEditorOnLastDraw = nullptr;
 		BaseEditor *m_activeEditor = nullptr;
@@ -45,7 +45,6 @@ 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?"};
@@ -56,7 +55,8 @@ class StudioUI: public ox::SignalHandler {
 		ig::MessagePopup m_messagePopup{"Message", ""};
 		MakeCopyPopup m_copyFilePopup;
 		RenameFile m_renameFile;
-		NewProject m_newProject{m_projectDataDir};
+		NewProject m_newProject;
+		AboutPopup m_aboutPopup;
 		ox::Array<Widget*, 10> const m_widgets {
 			&m_closeFileConfirm,
 			&m_closeAppConfirm,