Compare commits

...

2 Commits

Author SHA1 Message Date
3c7652efc2 [nostalgia/core/studio] Fix PaletteEditor to handle Palettes with 0 pages
All checks were successful
Build / build (push) Successful in 2m55s
2024-10-28 20:57:34 -05:00
941bc71348 [studio] Fix NewMenu name input 2024-10-28 20:57:34 -05:00
2 changed files with 18 additions and 16 deletions

View File

@ -154,22 +154,24 @@ void PaletteEditorImGui::drawColorsEditor() noexcept {
ImGui::TableSetupColumn("Blue", ImGuiTableColumnFlags_WidthFixed, 40); ImGui::TableSetupColumn("Blue", ImGuiTableColumnFlags_WidthFixed, 40);
ImGui::TableSetupColumn("Preview", ImGuiTableColumnFlags_NoHide); ImGui::TableSetupColumn("Preview", ImGuiTableColumnFlags_NoHide);
ImGui::TableHeadersRow(); ImGui::TableHeadersRow();
for (auto i = 0u; auto const&c : m_pal.pages[m_page].colors) { if (m_page < m_pal.pages.size()) {
ig::IDStackItem const idStackItem(static_cast<int>(i)); for (auto i = 0u; auto const &c: m_pal.pages[m_page].colors) {
ImGui::TableNextRow(); ig::IDStackItem const idStackItem(static_cast<int>(i));
drawColumn(i + 1); ImGui::TableNextRow();
drawColumnLeftAlign(m_pal.colorNames[i]); drawColumn(i + 1);
drawColumn(red16(c)); drawColumnLeftAlign(m_pal.colorNames[i]);
drawColumn(green16(c)); drawColumn(red16(c));
drawColumn(blue16(c)); drawColumn(green16(c));
ImGui::TableNextColumn(); drawColumn(blue16(c));
auto const ic = ImGui::GetColorU32({redf(c), greenf(c), bluef(c), 1}); ImGui::TableNextColumn();
ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, ic); auto const ic = ImGui::GetColorU32({redf(c), greenf(c), bluef(c), 1});
if (ImGui::Selectable( ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, ic);
"##ColorRow", i == m_selectedColorRow, ImGuiSelectableFlags_SpanAllColumns)) { if (ImGui::Selectable(
m_selectedColorRow = i; "##ColorRow", i == m_selectedColorRow, ImGuiSelectableFlags_SpanAllColumns)) {
m_selectedColorRow = i;
}
++i;
} }
++i;
} }
} }
ImGui::EndTable(); ImGui::EndTable();

View File

@ -77,7 +77,7 @@ void NewMenu::drawNewItemName(studio::StudioContext &sctx) noexcept {
drawWindow(sctx.tctx, &m_open, [this, &sctx] { drawWindow(sctx.tctx, &m_open, [this, &sctx] {
auto const typeIdx = static_cast<std::size_t>(m_selectedType); auto const typeIdx = static_cast<std::size_t>(m_selectedType);
if (typeIdx < m_types.size()) { if (typeIdx < m_types.size()) {
ImGui::InputText("Name", m_itemName.data(), m_itemName.cap()); ig::InputText("Name", m_itemName);
} }
drawLastPageButtons(sctx); drawLastPageButtons(sctx);
}); });