From 2fbeb8c685a0904ce09d5786f58c25f696306255 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Thu, 23 Jan 2025 21:58:02 -0600
Subject: [PATCH] Squashed 'deps/nostalgia/' changes from 161194c8..e40b1124

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

git-subtree-dir: deps/nostalgia
git-subtree-split: e40b11246dc9296d173e8c6a47f32993aa869030
---
 .../gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp
index fe2189a..35e4b1e 100644
--- a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp
+++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp
@@ -258,7 +258,7 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
 		std::ignore = pushCommand<ApplyColorAllPagesCommand>(
 				m_pal, m_page, m_selectedColorRow);
 	}
-	if (ig::mainWinHasFocus() && !inputFocused) {
+	if (ig::mainWinHasFocus() && !inputFocused && !ImGui::IsKeyDown(ImGuiKey_ModCtrl)) {
 		if (!ImGui::IsKeyDown(ImGuiKey_ModAlt)) {
 			numShortcuts(m_selectedColorRow, largestPage(m_pal));
 		} else {