drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 8 Activity

[nostalgia/studio] Fix closing last tab

Browse Source
This commit is contained in:
Gary Talent 2021-11-29 03:37:22 -06:00
parent a94051644b
commit 6e8bb8adc6
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/nostalgia/studio/studioapp.cpp
View File

@ -140,7 +140,8 @@ void StudioUI::drawTabs() noexcept {
ImGui::Begin("TabWindow##MainWindow", nullptr, windowFlags); ImGui::Begin("TabWindow##MainWindow", nullptr, windowFlags);
constexpr auto tabBarFlags = ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_TabListPopupButton; constexpr auto tabBarFlags = ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_TabListPopupButton;
if (ImGui::BeginTabBar("TabBar##TabWindow##MainWindow", tabBarFlags)) { if (ImGui::BeginTabBar("TabBar##TabWindow##MainWindow", tabBarFlags)) {
for (auto &e : m_editors) { for (auto it = m_editors.begin(); it != m_editors.end(); ) {
auto const &e = *it;
bool open = true; bool open = true;
if (ImGui::BeginTabItem(e->itemDisplayName().c_str(), &open)) { if (ImGui::BeginTabItem(e->itemDisplayName().c_str(), &open)) {
e->draw(m_ctx); e->draw(m_ctx);
@ -149,10 +150,14 @@ void StudioUI::drawTabs() noexcept {
if (!open) { if (!open) {
e->close(); e->close();
try { try {
oxThrowError(m_editors.erase(e)); oxThrowError(m_editors.erase(it).moveTo(&it));
} catch (const std::exception &e) { } catch (const ox::Exception &ex) {
oxErrf("Editor tab deletion failed: {}", e.what()); oxErrf("Editor tab deletion failed: {} ({}:{})\n", ex.what(), ex.file, ex.line);
} catch (const std::exception &ex) {
oxErrf("Editor tab deletion failed: {}\n", ex.what());
} }
} else {
++it;
} }
} }
ImGui::EndTabBar(); ImGui::EndTabBar();
@ -173,10 +178,10 @@ void StudioUI::loadModule(studio::Module *module) noexcept {
} }
void StudioUI::loadModules() noexcept { void StudioUI::loadModules() noexcept {
//for (auto &moduleMaker : BuiltinModules) { for (auto &moduleMaker : BuiltinModules) {
// const auto module = moduleMaker(); const auto module = moduleMaker();
// loadModule(module.get()); loadModule(module.get());
//} }
} }
ox::Error StudioUI::openProject(const ox::String &path) noexcept { ox::Error StudioUI::openProject(const ox::String &path) noexcept {