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

Squashed 'deps/nostalgia/' changes from 161194c8..e40b1124

Browse Source 
e40b1124 [nostalgia/gfx/studio/paletteeditor] Fix num key shortcuts to ignore if ctrl is down

git-subtree-dir: deps/nostalgia
git-subtree-split: e40b11246dc9296d173e8c6a47f32993aa869030
This commit is contained in:
Gary Talent 2025-01-23 21:58:02 -06:00
parent af93f94c67
commit 2fbeb8c685
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp
View File

@ -258,7 +258,7 @@ 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 (ig::mainWinHasFocus() && !inputFocused) { if (ig::mainWinHasFocus() && !inputFocused && !ImGui::IsKeyDown(ImGuiKey_ModCtrl)) {
if (!ImGui::IsKeyDown(ImGuiKey_ModAlt)) { if (!ImGui::IsKeyDown(ImGuiKey_ModAlt)) {
numShortcuts(m_selectedColorRow, largestPage(m_pal)); numShortcuts(m_selectedColorRow, largestPage(m_pal));
} else { } else {