Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Addons shortcuts: fix override

Browse Source 
Under some specific circumstances (changing the key and the modifier in a specific way
at the same time), Tracker would get confused and not change the shortcut.

Thanks Diver
This commit is contained in:
Philippe Saint-Pierre 2013-07-13 16:57:40 -04:00
parent 073218a8ae
commit 4ba4d40bb2
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kits/tracker/DeskWindow.cpp
View File

@ -167,6 +167,7 @@ LoadAddOnDir(directory_which dirName, BDeskWindow* window,
item->key = shortcut[0]; item->key = shortcut[0];
AddOneShortcut(model, item->key, kDefaultModifiers, window); AddOneShortcut(model, item->key, kDefaultModifiers, window);
item->defaultKey = item->key; item->defaultKey = item->key;
item->modifiers = kDefaultModifiers;
list->AddItem(item); list->AddItem(item);
} }
free(name); free(name);
@ -309,14 +310,10 @@ BDeskWindow::ApplyShortcutPreferences(bool update)
while (fileMsg.FindMessage("spec", i++, &message) == B_OK) { while (fileMsg.FindMessage("spec", i++, &message) == B_OK) {
int32 key; int32 key;
BMessage actMsg; if (message.FindInt32("key", &key) == B_OK) {
if (message.FindInt32("key", &key) == B_OK
&& message.FindMessage("act", &actMsg) == B_OK) {
// only handle shortcuts referring add-ons // only handle shortcuts referring add-ons
BString command; BString command;
if (actMsg.FindString("largv", &command) != B_OK) if (message.FindString("command", &command) != B_OK)
continue; continue;
BPath path; BPath path;
bool isInAddons = false; bool isInAddons = false;
@ -348,7 +345,8 @@ BDeskWindow::ApplyShortcutPreferences(bool update)
if (strlen(shortcut) != 1) if (strlen(shortcut) != 1)
continue; continue;
uint32 modifiers = 0; uint32 modifiers = B_COMMAND_KEY;
// it's required by interface kit to at least have B_COMMAND_KEY
int32 value; int32 value;
if (message.FindInt32("mcidx", 0, &value) == B_OK) if (message.FindInt32("mcidx", 0, &value) == B_OK)
modifiers |= (value != 0 ? B_SHIFT_KEY : 0); modifiers |= (value != 0 ? B_SHIFT_KEY : 0);
@ -356,15 +354,9 @@ BDeskWindow::ApplyShortcutPreferences(bool update)
if (message.FindInt32("mcidx", 1, &value) == B_OK) if (message.FindInt32("mcidx", 1, &value) == B_OK)
modifiers |= (value != 0 ? B_CONTROL_KEY : 0); modifiers |= (value != 0 ? B_CONTROL_KEY : 0);
if (message.FindInt32("mcidx", 2, &value) == B_OK)
modifiers |= (value != 0 ? B_COMMAND_KEY : 0);
if (message.FindInt32("mcidx", 3, &value) == B_OK) if (message.FindInt32("mcidx", 3, &value) == B_OK)
modifiers |= (value != 0 ? B_OPTION_KEY : 0); modifiers |= (value != 0 ? B_OPTION_KEY : 0);
if (modifiers == 0)
modifiers = kDefaultModifiers;
Model model(&entry); Model model(&entry);
AddonShortcut* item = fAddonsList->EachElement(FindElement, AddonShortcut* item = fAddonsList->EachElement(FindElement,
&model); &model);