mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-05 06:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0'

Browse Source 
Conflicts:
	src/ui/manager.cpp
This commit is contained in:
David Capello 2014-11-25 21:23:02 -03:00
commit 4920179143
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ private:
void onAddAccel() {
ui::Accelerator accel;
SelectAccelerator window(accel, m_key->keycontext());
SelectAccelerator window(accel, m_key ? m_key->keycontext(): KeyContext::Any);
window.openWindowInForeground();
if (window.isModified()) {

1
src/app/ui/select_accelerator.cpp
View File

@ -127,6 +127,7 @@ void SelectAccelerator::onModifierChange(KeyModifiers modifier, CheckBox* checkb
m_accel = Accelerator(modifiers, scancode, unicodeChar);
m_keyField->setAccel(m_accel);
m_keyField->requestFocus();
updateAssignedTo();
}

2
src/she/alleg4/key_poller.cpp
View File

@ -79,7 +79,7 @@ void key_poller_generate_events()
key_repeated[c] = 0;
}
// Generate kKeyDownMessage messages for modifiers
else if (c >= kKeyFirstModifierScancode) {
else if (c >= kKeyFirstModifierScancode || c == kKeyCommand) {
ev.setType(Event::KeyDown);
ev.setScancode(scancode);
ev.setUnicodeChar(::scancode_to_ascii(scancode));