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

Squashed 'deps/nostalgia/' changes from 0de428a2..00e52b64

Browse Source 
00e52b64 [nostalgia] Make pkg-dmg more versatile
ae404879 [nostalgia/gfx] Add navigateTo handler to TileSheetEditor
84b612c6 [studio/modlib] Give navigateTo a default argument
3c2a6b04 [studio/applib] Make navigateTo handle UUID paths
626da322 [ox/std] Add StringParam(IString const&) constructor

git-subtree-dir: deps/nostalgia
git-subtree-split: 00e52b649141b3daffd9a10b0320b142499c536f
This commit is contained in:
Gary Talent
2025-05-15 22:27:30 -05:00
parent 71b1e79d61
commit e2ca6389a9
9 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/olympic/studio/applib/src/studioui.cpp
View File

@@ -31,7 +31,15 @@ static bool shutdownHandler(turbine::Context &ctx) {
}
void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept {
ctx.ui.navigateTo(std::move(filePath), std::move(navArgs));
ox::String path = std::move(filePath);
if (beginsWith(path, "uuid://")) {
auto [p, err] = keel::uuidUrlToPath(keelCtx(ctx), path);
if (err) {
return;
}
path = p;
}
ctx.ui.navigateTo(std::move(path), std::move(navArgs));
}
namespace ig {

2
src/olympic/studio/modlib/include/studio/context.hpp
View File

@@ -27,6 +27,6 @@ inline keel::Context &keelCtx(Context &ctx) noexcept {
return keelCtx(ctx.tctx);
}
void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept;
void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs = "") noexcept;
}