mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-05 18:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression: empty Edit > Keyboard Shortcuts > Action Modifiers (fix #4893)

Browse Source
This commit is contained in:
Gaspar Capello 2024-12-23 17:01:43 -03:00 committed by David Capello
parent 912af16453
commit ff0dfb8331
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/commands/cmd_keyboard_shortcuts.cpp
View File

@ -582,10 +582,10 @@ private:
fillWheelActionsList(); fillWheelActionsList();
fillDragActionsList(); fillDragActionsList();
// Fill the 'Commands' and 'Action Modifier' lists
for (const KeyPtr& key : m_keys) { for (const KeyPtr& key : m_keys) {
if (key->type() == KeyType::Tool || key->type() == KeyType::Quicktool || if ((key->type() == KeyType::Command && !key->isCommandListed()) &&
key->type() == KeyType::WheelAction || key->type() == KeyType::DragAction || (key->type() != KeyType::Action)) {
key->isListed()) {
continue; continue;
} }

2
src/app/ui/key.h
View File

@ -131,7 +131,7 @@ public:
const KeyboardShortcuts& globalKeys) const; const KeyboardShortcuts& globalKeys) const;
bool isPressed() const; bool isPressed() const;
bool isLooselyPressed() const; bool isLooselyPressed() const;
bool isListed() const; bool isCommandListed() const;
bool hasAccel(const ui::Accelerator& accel) const; bool hasAccel(const ui::Accelerator& accel) const;
bool hasUserDefinedAccels() const; bool hasUserDefinedAccels() const;

4
src/app/ui/keyboard_shortcuts.cpp
View File

@ -536,9 +536,9 @@ bool Key::isLooselyPressed() const
return false; return false;
} }
bool Key::isListed() const bool Key::isCommandListed() const
{ {
return type() != KeyType::Command || !command()->isListed(params()); return type() == KeyType::Command && command()->isListed(params());
} }
bool Key::hasAccel(const ui::Accelerator& accel) const bool Key::hasAccel(const ui::Accelerator& accel) const