mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 21:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems assigning different but similar modifiers to mouse wheel actions

Browse Source 
For example, before this change we were depending on the order of the
wheel actions. If an action were associated to <Ctrl> and other one to
<Ctrl+Shift>, when we pressed <Ctrl+Shift> we weren't returning the
action with most modifiers pressed (in this case <Ctrl+Shift>), but
instead the one that was checked first in the for loop (which could
be the one with <Ctrl>).
This commit is contained in:
David Capello 2018-07-24 13:45:12 -03:00
parent 65bc54904d
commit 95c6af355c
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,8 +114,8 @@ namespace app {
void add(const ui::Accelerator& accel, void add(const ui::Accelerator& accel,
const KeySource source, const KeySource source,
KeyboardShortcuts& globalKeys); KeyboardShortcuts& globalKeys);
bool isPressed(const ui::Message* msg, const ui::Accelerator* isPressed(const ui::Message* msg,
KeyboardShortcuts& globalKeys) const; KeyboardShortcuts& globalKeys) const;
bool isPressed() const; bool isPressed() const;
bool isLooselyPressed() const; bool isLooselyPressed() const;

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

@ -266,8 +266,8 @@ void Key::add(const ui::Accelerator& accel,
accels->add(accel); accels->add(accel);
} }
bool Key::isPressed(const Message* msg, const ui::Accelerator* Key::isPressed(const Message* msg,
KeyboardShortcuts& globalKeys) const KeyboardShortcuts& globalKeys) const
{ {
if (auto keyMsg = dynamic_cast<const KeyMessage*>(msg)) { if (auto keyMsg = dynamic_cast<const KeyMessage*>(msg)) {
for (const Accelerator& accel : accels()) { for (const Accelerator& accel : accels()) {
@ -276,7 +276,7 @@ bool Key::isPressed(const Message* msg,
keyMsg->unicodeChar()) && keyMsg->unicodeChar()) &&
(m_keycontext == KeyContext::Any || (m_keycontext == KeyContext::Any ||
m_keycontext == globalKeys.getCurrentKeyContext())) { m_keycontext == globalKeys.getCurrentKeyContext())) {
return true; return &accel;
} }
} }
} }
@ -288,11 +288,11 @@ bool Key::isPressed(const Message* msg,
// like "sprite editor" context, or "timeline" context, // like "sprite editor" context, or "timeline" context,
// etc. // etc.
m_keycontext == KeyContext::MouseWheel)) { m_keycontext == KeyContext::MouseWheel)) {
return true; return &accel;
} }
} }
} }
return false; return nullptr;
} }
bool Key::isPressed() const bool Key::isPressed() const
@ -852,13 +852,21 @@ KeyAction KeyboardShortcuts::getCurrentActionModifiers(KeyContext context)
WheelAction KeyboardShortcuts::getWheelActionFromMouseMessage(const KeyContext context, WheelAction KeyboardShortcuts::getWheelActionFromMouseMessage(const KeyContext context,
const ui::Message* msg) const ui::Message* msg)
{ {
WheelAction wheelAction = WheelAction::None;
const ui::Accelerator* bestAccel = nullptr;
KeyPtr bestKey;
for (const KeyPtr& key : m_keys) { for (const KeyPtr& key : m_keys) {
if (key->type() == KeyType::WheelAction && if (key->type() == KeyType::WheelAction &&
key->keycontext() == context && key->keycontext() == context) {
key->isPressed(msg, *this)) const ui::Accelerator* accel = key->isPressed(msg, *this);
return key->wheelAction(); if ((accel) &&
(!bestAccel || bestAccel->modifiers() < accel->modifiers())) {
bestAccel = accel;
wheelAction = key->wheelAction();
}
}
} }
return WheelAction::None; return wheelAction;
} }
bool KeyboardShortcuts::hasMouseWheelCustomization() const bool KeyboardShortcuts::hasMouseWheelCustomization() const