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

* Remove cmd+opt+ctrl+up shortcuts since that's an undocumented old combo and it clashes with workspace navigation. Only cmd+up and opt+cmd+up remains. I've checked that it indeed conforms to the user guide, but having a second eye wouldn't hurt. Also reordered the constants for more consitency between the calls.

Browse Source 
Fixes #6833



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39479 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexandre Deckner 2010-11-18 15:05:32 +00:00
parent 5afe0aef82
commit d769c15ad5
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/kits/tracker/ContainerWindow.cpp
View File

@ -3900,10 +3900,9 @@ BContainerWindow::SetSingleWindowBrowseShortcuts(bool enabled)
if (!Navigator())
return;
RemoveShortcut(B_DOWN_ARROW, B_OPTION_KEY | B_COMMAND_KEY);
RemoveShortcut(B_DOWN_ARROW, B_COMMAND_KEY | B_OPTION_KEY);
RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY);
RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY);
RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY | B_CONTROL_KEY);
RemoveShortcut(B_UP_ARROW, B_COMMAND_KEY | B_CONTROL_KEY);
AddShortcut(B_LEFT_ARROW, B_COMMAND_KEY,
new BMessage(kNavigatorCommandBackward), Navigator());
@ -3930,16 +3929,14 @@ BContainerWindow::SetSingleWindowBrowseShortcuts(bool enabled)
RemoveShortcut(B_UP_ARROW, B_OPTION_KEY | B_COMMAND_KEY);
// This also changes meaning, added again below.
AddShortcut(B_DOWN_ARROW, B_OPTION_KEY | B_COMMAND_KEY,
AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY | B_OPTION_KEY,
new BMessage(kOpenSelection), PoseView());
AddShortcut(B_UP_ARROW, B_COMMAND_KEY,
new BMessage(kOpenParentDir), PoseView());
// We change the meaning from kNavigatorCommandUp to kOpenParentDir.
AddShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY,
new BMessage(kOpenParentDir), PoseView());
AddShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY | B_CONTROL_KEY,
new BMessage(kOpenParentDir), PoseView());
// the command option results in closing the parent window
// command + option results in closing the parent window
}
}