drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 9 Activity

[turbine,studio] Fix confirm app close pop up to work with Ctrl-Q
All checks were successful
Build / build (push) Successful in 2m1s
Details

Browse Source
This commit is contained in:
Gary Talent 2025-05-06 23:23:24 -05:00
parent 136f422401
commit cd43fb7f38
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -588,7 +588,7 @@ ox::Error StudioUI::makeCopyDlg(ox::StringViewCR path) noexcept {
ox::Error StudioUI::handleCloseAppResponse(ig::PopupResponse const response) noexcept {
if (response == ig::PopupResponse::OK && m_activeEditor) {
turbine::requestShutdown(m_tctx);
turbine::requestShutdown(m_tctx, true);
}
return {};
}

2
src/olympic/turbine/include/turbine/turbine.hpp
View File

@ -27,7 +27,7 @@ ox::Error run(Context &ctx) noexcept;
[[nodiscard]]
TimeMs ticksMs(Context const&ctx) noexcept;
void requestShutdown(Context &ctx) noexcept;
void requestShutdown(Context &ctx, bool force = false) noexcept;
using ShutdownHandler = bool (*)(Context&);

2
src/olympic/turbine/src/gba/turbine.cpp
View File

@ -82,7 +82,7 @@ bool buttonDown(Context const&, Key k) noexcept {
return k <= Key::GamePad_L && !(REG_GAMEPAD & (1 << static_cast<int>(k)));
}
void requestShutdown(Context &ctx) noexcept {
void requestShutdown(Context &ctx, bool) noexcept {
ctx.running = false;
}

7
src/olympic/turbine/src/glfw/turbine.cpp
View File

@ -125,8 +125,11 @@ bool buttonDown(Context const&ctx, Key const key) noexcept {
return (ctx.keysDown >> static_cast<int>(key)) & 1;
}
void requestShutdown(Context &ctx) noexcept {
ctx.running = false;
void requestShutdown(Context &ctx, bool const force) noexcept {
glfwSetWindowShouldClose(ctx.window, true);
if (force) {
ctx.running = false;
}
}
void setShutdownHandler(Context &ctx, ShutdownHandler const handler) noexcept {