From 54fcbb1a330d284066bd38a1664fbbc4e7e82633 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Mon, 4 Dec 2023 21:45:59 -0600 Subject: [PATCH] [studio] Adjust size of NewMenu, sort items, rename Quit to Cancel --- src/studio/applib/src/newmenu.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/studio/applib/src/newmenu.cpp b/src/studio/applib/src/newmenu.cpp index 69245498..83fece16 100644 --- a/src/studio/applib/src/newmenu.cpp +++ b/src/studio/applib/src/newmenu.cpp @@ -13,7 +13,7 @@ namespace studio { NewMenu::NewMenu() noexcept { setTitle(ox::String("New Item")); - setSize({225, 110}); + setSize({230, 140}); } void NewMenu::open() noexcept { @@ -51,6 +51,11 @@ void NewMenu::draw(turbine::Context *ctx) noexcept { void NewMenu::addItemMaker(ox::UniquePtr im) noexcept { m_types.emplace_back(std::move(im)); + std::sort( + m_types.begin(), m_types.end(), + [](ox::UPtr const&im1, ox::UPtr const&im2) { + return im1->name < im2->name; + }); } void NewMenu::drawNewItemType(turbine::Context *ctx) noexcept { @@ -76,13 +81,14 @@ void NewMenu::drawNewItemName(turbine::Context *ctx) noexcept { } void NewMenu::drawFirstPageButtons() noexcept { - ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 80); + ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 130); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 20); - if (ImGui::Button("Next")) { + auto const btnSz = ImVec2(60, 20); + if (ImGui::Button("Next", btnSz)) { m_stage = Stage::NewItemName; } ImGui::SameLine(); - if (ImGui::Button("Quit")) { + if (ImGui::Button("Cancel", btnSz)) { ImGui::CloseCurrentPopup(); m_stage = Stage::Closed; }