Compare commits
No commits in common. "3c7652efc205cb3acdb993d7eeb1e2c2d894c2cb" and "e4ae23e1147fd72f7ba50b0643307bfb7195de52" have entirely different histories.
3c7652efc2
...
e4ae23e114
@ -154,7 +154,6 @@ 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();
|
||||||
if (m_page < m_pal.pages.size()) {
|
|
||||||
for (auto i = 0u; auto const&c : m_pal.pages[m_page].colors) {
|
for (auto i = 0u; auto const&c : m_pal.pages[m_page].colors) {
|
||||||
ig::IDStackItem const idStackItem(static_cast<int>(i));
|
ig::IDStackItem const idStackItem(static_cast<int>(i));
|
||||||
ImGui::TableNextRow();
|
ImGui::TableNextRow();
|
||||||
@ -173,7 +172,6 @@ void PaletteEditorImGui::drawColorsEditor() noexcept {
|
|||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
ImGui::EndTable();
|
ImGui::EndTable();
|
||||||
if (colorEditor) {
|
if (colorEditor) {
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
|
@ -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()) {
|
||||||
ig::InputText("Name", m_itemName);
|
ImGui::InputText("Name", m_itemName.data(), m_itemName.cap());
|
||||||
}
|
}
|
||||||
drawLastPageButtons(sctx);
|
drawLastPageButtons(sctx);
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user