mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-27 21:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated code checking if mnemonic+modifiers are pressed

Browse Source
This commit is contained in:
David Capello 2024-12-10 10:16:20 -03:00
parent cfc92e7cdb
commit 70f2cd9559
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/button.cpp
View File

@ -86,11 +86,7 @@ bool ButtonBase::onProcessMessage(Message* msg)
if (isEnabled() && isVisible()) { if (isEnabled() && isVisible()) {
const bool mnemonicPressed = const bool mnemonicPressed =
(mnemonic() && isMnemonicPressedWithModifiers(keymsg);
(!mnemonicRequiresModifiers() ||
msg->altPressed() ||
msg->cmdPressed()) &&
isMnemonicPressed(keymsg));
// For kButtonWidget // For kButtonWidget
if (m_behaviorType == kButtonWidget) { if (m_behaviorType == kButtonWidget) {
@ -157,11 +153,8 @@ bool ButtonBase::onProcessMessage(Message* msg)
KeyMessage* keymsg = static_cast<KeyMessage*>(msg); KeyMessage* keymsg = static_cast<KeyMessage*>(msg);
KeyScancode scancode = keymsg->scancode(); KeyScancode scancode = keymsg->scancode();
const bool mnemonicPressed = const bool mnemonicPressed =
(mnemonic() && isMnemonicPressedWithModifiers(keymsg);
(!mnemonicRequiresModifiers() ||
msg->altPressed() ||
msg->cmdPressed()) &&
isMnemonicPressed(keymsg));
// Fire the onClick() event only if the user pressed space or // Fire the onClick() event only if the user pressed space or
// Alt+the underscored letter of the checkbox label. // Alt+the underscored letter of the checkbox label.
if (scancode == kKeySpace || mnemonicPressed) { if (scancode == kKeySpace || mnemonicPressed) {

9
src/ui/widget.cpp
View File

@ -1556,6 +1556,15 @@ bool Widget::isMnemonicPressed(const KeyMessage* keyMsg) const
(chr >= '0' && chr <= '9' && keyMsg->scancode() == (kKey0 + chr - '0')))); (chr >= '0' && chr <= '9' && keyMsg->scancode() == (kKey0 + chr - '0'))));
} }
bool Widget::isMnemonicPressedWithModifiers(const KeyMessage* msg) const
{
return (mnemonic() &&
(!mnemonicRequiresModifiers() ||
msg->altPressed() ||
msg->cmdPressed()) &&
isMnemonicPressed(msg));
}
bool Widget::onProcessMessage(Message* msg) bool Widget::onProcessMessage(Message* msg)
{ {
ASSERT(msg != nullptr); ASSERT(msg != nullptr);

8
src/ui/widget.h
View File

@ -384,7 +384,7 @@ namespace ui {
// Offer the capture to widgets of the given type. Returns true if // Offer the capture to widgets of the given type. Returns true if
// the capture was passed to other widget. // the capture was passed to other widget.
bool offerCapture(ui::MouseMessage* mouseMsg, int widget_type); bool offerCapture(MouseMessage* mouseMsg, int widget_type);
// Returns lower-case letter that represet the mnemonic of the widget // Returns lower-case letter that represet the mnemonic of the widget
// (the underscored character, i.e. the letter after & symbol). // (the underscored character, i.e. the letter after & symbol).
@ -405,7 +405,11 @@ namespace ui {
// Returns true if the mnemonic character is pressed (without modifiers). // Returns true if the mnemonic character is pressed (without modifiers).
// TODO maybe we can add check for modifiers now that this // TODO maybe we can add check for modifiers now that this
// information is included in the Widget // information is included in the Widget
bool isMnemonicPressed(const ui::KeyMessage* keyMsg) const; bool isMnemonicPressed(const KeyMessage* keyMsg) const;
// Returns true if the mnemonic character is pressed with
// modifiers (Alt or Command key).
bool isMnemonicPressedWithModifiers(const KeyMessage* msg) const;
// Signals // Signals
obs::signal<void()> InitTheme; obs::signal<void()> InitTheme;