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

[nostalgia/core/studio] Fix PaletteEditor shortcuts to differentiate based on Alt key

Browse Source
This commit is contained in:
Gary Talent 2024-10-01 22:37:05 -05:00
parent e22b25e54c
commit 36c4022b56
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp
View File

@ -253,13 +253,13 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
std::ignore = pushCommand<ApplyColorAllPagesCommand>( std::ignore = pushCommand<ApplyColorAllPagesCommand>(
m_pal, m_page, m_selectedColorRow); m_pal, m_page, m_selectedColorRow);
} }
if (!inputFocused && !m_pageRename.isOpen()) { if (!inputFocused && !m_pageRename.isOpen() && !ImGui::IsKeyDown(ImGuiKey_ModAlt)) {
auto const lastColor = largestPage(m_pal) - 1; auto const lastColor = largestPage(m_pal) - 1;
if (ImGui::IsKeyPressed(ImGuiKey_0, false)) { if (ImGui::IsKeyPressed(ImGuiKey_0)) {
m_selectedColorRow = ox::min<size_t>(9, lastColor); m_selectedColorRow = ox::min<size_t>(9, lastColor);
} else for (auto i = 9u; i < 10; --i) { } else for (auto i = 9u; i < 10; --i) {
auto const key = static_cast<ImGuiKey>(ImGuiKey_1 + i); auto const key = static_cast<ImGuiKey>(ImGuiKey_1 + i);
if (ImGui::IsKeyPressed(key, false)) { if (ImGui::IsKeyPressed(key)) {
m_selectedColorRow = ox::min<size_t>(i, lastColor); m_selectedColorRow = ox::min<size_t>(i, lastColor);
break; break;
} }