From 861d177a2733b22ccb511ace17898a635591802a Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Mon, 13 Jan 2025 22:58:39 -0600 Subject: [PATCH] [studio] Cleanup --- src/olympic/studio/applib/src/studioapp.cpp | 38 ++++++++++----------- src/olympic/studio/applib/src/studioapp.hpp | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/olympic/studio/applib/src/studioapp.cpp b/src/olympic/studio/applib/src/studioapp.cpp index cbf3fcd7..7ae49c57 100644 --- a/src/olympic/studio/applib/src/studioapp.cpp +++ b/src/olympic/studio/applib/src/studioapp.cpp @@ -45,19 +45,19 @@ OX_MODEL_END() StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexcept: m_sctx(*this, ctx), - m_ctx(ctx), + m_tctx(ctx), m_projectDataDir(std::move(projectDataDir)), - m_projectExplorer(m_ctx), + m_projectExplorer(m_tctx), m_newProject(m_projectDataDir), - m_aboutPopup(m_ctx) { - turbine::setApplicationData(m_ctx, &m_sctx); + m_aboutPopup(m_tctx) { + turbine::setApplicationData(m_tctx, &m_sctx); m_projectExplorer.fileChosen.connect(this, &StudioUI::openFile); m_newProject.finished.connect(this, &StudioUI::createOpenProject); m_newMenu.finished.connect(this, &StudioUI::openFile); ImGui::GetIO().IniFilename = nullptr; loadModules(); // open project and files - auto const [config, err] = studio::readConfig(keelCtx(m_ctx)); + auto const [config, err] = studio::readConfig(keelCtx(m_tctx)); m_showProjectExplorer = config.showProjectExplorer; if (!err) { auto const openProjErr = openProjectPath(config.projectPath); @@ -124,7 +124,7 @@ void StudioUI::draw() noexcept { } ImGui::End(); handleKeyInput(); - m_taskRunner.update(m_ctx); + m_taskRunner.update(m_tctx); } void StudioUI::drawMenu() noexcept { @@ -143,7 +143,7 @@ void StudioUI::drawMenu() noexcept { m_activeEditor->save(); } if (ImGui::MenuItem("Quit", "Ctrl+Q")) { - turbine::requestShutdown(m_ctx); + turbine::requestShutdown(m_tctx); } ImGui::EndMenu(); } @@ -204,10 +204,10 @@ void StudioUI::drawTabs() noexcept { if (ImGui::BeginTabItem(e->itemDisplayName().c_str(), &open, flags)) { if (m_activeEditor != e.get()) [[unlikely]] { m_activeEditor = e.get(); - studio::editConfig(keelCtx(m_ctx), [&](StudioConfig &config) { + studio::editConfig(keelCtx(m_tctx), [&](StudioConfig &config) { config.activeTabItemName = m_activeEditor->itemPath(); }); - turbine::setRefreshWithin(m_ctx, 0); + turbine::setRefreshWithin(m_tctx, 0); } else [[likely]] { if (m_activeEditorUpdatePending == e.get()) [[unlikely]] { m_activeEditorUpdatePending = nullptr; @@ -261,7 +261,7 @@ void StudioUI::loadModules() noexcept { void StudioUI::toggleProjectExplorer() noexcept { m_showProjectExplorer = !m_showProjectExplorer; - editConfig(keelCtx(m_ctx), [&](StudioConfig &config) { + editConfig(keelCtx(m_tctx), [&](StudioConfig &config) { config.showProjectExplorer = m_showProjectExplorer; }); } @@ -293,7 +293,7 @@ void StudioUI::handleKeyInput() noexcept { m_activeEditor->copy(); } } else if (ImGui::IsKeyPressed(ImGuiKey_N)) { - if (turbine::buttonDown(m_ctx, turbine::Key::Mod_Shift)) { + if (turbine::buttonDown(m_tctx, turbine::Key::Mod_Shift)) { m_newProject.open(); } else { m_newMenu.open(); @@ -303,7 +303,7 @@ void StudioUI::handleKeyInput() noexcept { } else if (ImGui::IsKeyPressed(ImGuiKey_S)) { save(); } else if (ImGui::IsKeyPressed(ImGuiKey_Q)) { - turbine::requestShutdown(m_ctx); + turbine::requestShutdown(m_tctx); } else if (ImGui::IsKeyPressed(ImGuiKey_V)) { if (m_activeEditor && m_activeEditor->pasteEnabled()) { m_activeEditor->paste(); @@ -348,18 +348,18 @@ ox::Error StudioUI::createOpenProject(ox::StringViewCR path) noexcept { ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept { OX_REQUIRE_M(fs, keel::loadRomFs(path.view())); - OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_ctx), std::move(fs))); + OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs))); OX_RETURN_ERROR( - ox::make_unique_catch(keelCtx(m_ctx), std::move(path), m_projectDataDir) + ox::make_unique_catch(keelCtx(m_tctx), std::move(path), m_projectDataDir) .moveTo(m_project)); - auto const sctx = applicationData(m_ctx); + auto const sctx = applicationData(m_tctx); sctx->project = m_project.get(); - turbine::setWindowTitle(m_ctx, ox::sfmt("{} - {}", keelCtx(m_ctx).appName, m_project->projectPath())); + turbine::setWindowTitle(m_tctx, ox::sfmt("{} - {}", keelCtx(m_tctx).appName, m_project->projectPath())); m_project->fileAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel); m_project->fileDeleted.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel); m_openFiles.clear(); m_editors.clear(); - studio::editConfig(keelCtx(m_ctx), [&](StudioConfig &config) { + studio::editConfig(keelCtx(m_tctx), [&](StudioConfig &config) { config.projectPath = ox::String(m_project->projectPath()); config.openFiles.clear(); }); @@ -406,7 +406,7 @@ ox::Error StudioUI::openFileActiveTab(ox::StringViewCR path, bool const makeActi m_activeEditorUpdatePending = editor; } // save to config - studio::editConfig(keelCtx(m_ctx), [&path](StudioConfig &config) { + studio::editConfig(keelCtx(m_tctx), [&path](StudioConfig &config) { if (!config.openFiles.contains(path)) { config.openFiles.emplace_back(path); } @@ -420,7 +420,7 @@ ox::Error StudioUI::closeFile(ox::StringViewCR path) noexcept { } std::ignore = m_openFiles.erase(std::remove(m_openFiles.begin(), m_openFiles.end(), path)); // save to config - studio::editConfig(keelCtx(m_ctx), [&](StudioConfig &config) { + studio::editConfig(keelCtx(m_tctx), [&](StudioConfig &config) { std::ignore = config.openFiles.erase(std::remove(config.openFiles.begin(), config.openFiles.end(), path)); }); return {}; diff --git a/src/olympic/studio/applib/src/studioapp.hpp b/src/olympic/studio/applib/src/studioapp.hpp index 17382609..64907860 100644 --- a/src/olympic/studio/applib/src/studioapp.hpp +++ b/src/olympic/studio/applib/src/studioapp.hpp @@ -25,7 +25,7 @@ class StudioUI: public ox::SignalHandler { private: StudioContext m_sctx; - turbine::Context &m_ctx; + turbine::Context &m_tctx; ox::String m_projectDataDir; ox::UPtr m_project; TaskRunner m_taskRunner;