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

Squashed 'deps/nostalgia/' changes from ab025e88..4d63a65f

Browse Source 
4d63a65f [nostalgia/core/studio] Show Palette page names in TileSheetEditor
686db99d [nostalgia/core/studio] Disable Palette page hotkeys when Rename popup is open
52533c8c [nostalgia/core/studio] Add Palette page names to editor
ba4540e4 [ox/std] Add IString::unsafeResize
36057bb0 [nostalgia/core/studio] Fix Clang build
1a2b2b8b [nostalgia/core] Add PaletteV4, with support for page names, make PaletteColor object
6189193a [nostalgia] Add NFDE install
67a10d35 [nostalgia/sample_project] Update type descriptor

git-subtree-dir: deps/nostalgia
git-subtree-split: 4d63a65fbde480235edd961e5cd19d8b4de1b66d
This commit is contained in:
Gary Talent
2024-09-07 00:16:03 -05:00
parent a1a34f27f9
commit ca2d9eb534
23 changed files with 459 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ bool AboutPopup::isOpen() const noexcept {
return m_stage == Stage::Open;
}
void AboutPopup::draw(studio::StudioContext &sctx) noexcept {
void AboutPopup::draw(StudioContext &sctx) noexcept {
switch (m_stage) {
case Stage::Closed:
break;
@@ -40,15 +40,14 @@ void AboutPopup::draw(studio::StudioContext &sctx) noexcept {
case Stage::Open: {
constexpr auto modalFlags =
ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
ImGui::SetNextWindowSize(ImVec2(215, 90));
studio::ig::centerNextWindow(sctx.tctx);
ig::centerNextWindow(sctx.tctx);
auto open = true;
if (ImGui::BeginPopupModal("About", &open, modalFlags)) {
ImGui::Text("%s", m_text.c_str());
ImGui::NewLine();
ImGui::Dummy(ImVec2(148.0f, 0.0f));
ImGui::Dummy({148.0f, 0.0f});
ImGui::SameLine();
if (ImGui::Button("Close")) {
if (ig::PushButton("Close")) {
ImGui::CloseCurrentPopup();
open = false;
}