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

Merge commit '611df32bdb02e80feecba9e0084a9fa723913c0d'

Browse Source
This commit is contained in:
Gary Talent
2025-02-20 23:38:27 -06:00
parent 1720328735 611df32bdb
commit 77d526d6ac
9 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,10 @@
namespace studio {
ox::Error navigateTo(StudioContext &ctx, ox::StringViewCR filePath, ox::StringViewCR args) noexcept {
return ctx.ui.navigateTo(filePath, args);
}
namespace ig {
extern bool s_mainWinHasFocus;
}
@@ -107,6 +111,12 @@ void StudioUI::handleKeyEvent(turbine::Key const key, bool const down) noexcept
}
}
ox::Error StudioUI::navigateTo(ox::StringViewCR path, ox::StringViewCR navArgs) noexcept {
OX_RETURN_ERROR(openFile(path));
m_activeEditor->navigateTo(navArgs);
return {};
}
void StudioUI::draw() noexcept {
glutils::clearScreen();
drawMenu();

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

@@ -68,6 +68,8 @@ class StudioUI: public ox::SignalHandler {
void handleKeyEvent(turbine::Key, bool down) noexcept;
ox::Error navigateTo(ox::StringViewCR path, ox::StringViewCR navArgs = {}) noexcept;
[[nodiscard]]
constexpr Project *project() noexcept {
return m_project.get();