Merge commit '2fbeb8c685a0904ce09d5786f58c25f696306255'
This commit is contained in:
commit
cf765d2745
@ -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 {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user