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

Squashed 'deps/nostalgia/' changes from 5848bc8e..c2e34b64

Browse Source 
c2e34b64 Merge commit 'a9128caf4ddd187f14496b84242dfe07ee9a6467'
173d3f4b [olympic/studio] Add PushButton, PopupBtns, ComboBox, and IDStackItem to ImGui utils
8a29c095 [olympic/studio] Fix imguiutil.hpp name, add StudioContext::tctx

git-subtree-dir: deps/nostalgia
git-subtree-split: c2e34b64568172a12d25ca4b54796d2d4a56a652
This commit is contained in:
Gary Talent
2024-01-20 15:00:40 -06:00
parent a9128caf4d
commit 2abbc258a5
10 changed files with 94 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
#include <imgui.h>
#include <studio/imguiuitl.hpp>
#include <studio/imguiutil.hpp>
#include "aboutpopup.hpp"
namespace olympic {

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

@@ -48,7 +48,7 @@ static ox::Error runApp(
turbine::setUpdateHandler(*ctx, updateHandler);
turbine::setKeyEventHandler(*ctx, keyEventHandler);
turbine::setConstantRefresh(*ctx, false);
studio::StudioContext studioCtx;
studio::StudioContext studioCtx(*ctx);
turbine::setApplicationData(*ctx, &studioCtx);
StudioUI ui(*ctx, projectDataDir);
studioCtx.ui = &ui;

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

@@ -6,7 +6,7 @@
#include <imgui.h>
#include <studio/imguiuitl.hpp>
#include <studio/imguiutil.hpp>
#include "newmenu.hpp"

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

@@ -4,7 +4,7 @@
#include <imgui.h>
#include <studio/imguiuitl.hpp>
#include <studio/imguiutil.hpp>
#include <utility>
#include "filedialogmanager.hpp"