drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Merge commit '22e6299e90e85cb2b5ee814ebf2324b1a74d7091'

Browse Source
This commit is contained in:
Gary Talent
2024-04-24 23:12:54 -05:00
parent eecc9da3ce 22e6299e90
commit 35c97cfb67
184 changed files with 1262 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/nostalgia/src/olympic/studio/applib/src/newmenu.hpp vendored
View File

@@ -28,7 +28,7 @@ class NewMenu: public studio::Popup {
private:
Stage m_stage = Stage::Closed;
ox::String m_typeName;
ox::BString<255> m_itemName;
ox::IString<255> m_itemName;
ox::Vector<ox::UniquePtr<studio::ItemMaker>> m_types;
int m_selectedType = 0;
bool m_open = false;

2
deps/nostalgia/src/olympic/studio/applib/src/newproject.hpp vendored
View File

@@ -28,7 +28,7 @@ class NewProject: public studio::Popup {
Stage m_stage = Stage::Closed;
ox::String const m_projectDataDir;
ox::String m_projectPath;
ox::BString<255> m_projectName;
ox::IString<255> m_projectName;
ox::Vector<ox::UniquePtr<studio::ItemMaker>> m_types;
bool m_open = false;

4
deps/nostalgia/src/olympic/studio/applib/src/studioapp.cpp vendored
View File

@@ -417,10 +417,10 @@ ox::Error StudioUI::closeFile(ox::CRStringView path) noexcept {
if (!m_openFiles.contains(path)) {
return {};
}
oxIgnoreError(m_openFiles.erase(std::remove(m_openFiles.begin(), m_openFiles.end(), path)));
std::ignore = m_openFiles.erase(std::remove(m_openFiles.begin(), m_openFiles.end(), path));
// save to config
studio::editConfig<StudioConfig>(keelCtx(m_ctx), [&](StudioConfig *config) {
oxIgnoreError(config->openFiles.erase(std::remove(config->openFiles.begin(), config->openFiles.end(), path)));
std::ignore = config->openFiles.erase(std::remove(config->openFiles.begin(), config->openFiles.end(), path));
});
return {};
}

2
deps/nostalgia/src/olympic/studio/modlib/src/filedialog_nfd.cpp vendored
View File

@@ -24,7 +24,7 @@ static ox::Result<ox::String> toResult(nfdresult_t r, NFD::UniquePathN const&pat
ox::String out;
for (auto i = 0u; path.get()[i]; ++i) {
auto const c = static_cast<char>(path.get()[i]);
oxIgnoreError(out.append(&c, 1));
std::ignore = out.append(&c, 1);
}
return out;
}

4
deps/nostalgia/src/olympic/studio/modlib/src/task.cpp vendored
View File

@@ -9,13 +9,13 @@
namespace studio {
void TaskRunner::update(turbine::Context &ctx) noexcept {
oxIgnoreError(m_tasks.erase(std::remove_if(m_tasks.begin(), m_tasks.end(), [&](ox::UPtr<studio::Task> &t) {
std::ignore = m_tasks.erase(std::remove_if(m_tasks.begin(), m_tasks.end(), [&](ox::UPtr<studio::Task> &t) {
auto const done = t->update(ctx) == TaskState::Done;
if (done) {
t->finished.emit();
}
return done;
})));
}));
}
void TaskRunner::add(Task &task) noexcept {

2
deps/nostalgia/src/olympic/studio/modlib/src/undostack.cpp vendored
View File

@@ -12,7 +12,7 @@ bool UndoCommand::mergeWith(UndoCommand const*) noexcept {
void UndoStack::push(ox::UPtr<UndoCommand> &&cmd) noexcept {
for (auto const i = m_stackIdx; i < m_stack.size();) {
oxIgnoreError(m_stack.erase(i));
std::ignore = m_stack.erase(i);
}
cmd->redo();
redoTriggered.emit(cmd.get());