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

Extend the Ctrl-Alt-arrows shortcuts to also move the current window when shift is held, as on Gnome.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33690 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2009-10-20 23:45:18 +00:00
parent 35e7c9642f
commit 223ae47d99
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/kits/interface/Window.cpp
View File

@ -890,6 +890,8 @@ BWindow::DispatchMessage(BMessage* msg, BHandler* target)
msg->FindInt32("delta_x", &deltaX); msg->FindInt32("delta_x", &deltaX);
int32 deltaY = 0; int32 deltaY = 0;
msg->FindInt32("delta_y", &deltaY); msg->FindInt32("delta_y", &deltaY);
bool takeMeThere = false;
msg->FindBool("take_me_there", &takeMeThere);
if (deltaX == 0 && deltaY == 0) if (deltaX == 0 && deltaY == 0)
break; break;
@ -920,8 +922,25 @@ BWindow::DispatchMessage(BMessage* msg, BHandler* target)
nextRow = 0; nextRow = 0;
int32 next = nextColumn + nextRow * columns; int32 next = nextColumn + nextRow * columns;
if (next != current) if (next != current) {
uint32 workspaces;
if (takeMeThere) {
workspaces = Workspaces() | (1 << next);
// add the next workspaces to the workspaces
if (workspaces != Workspaces())
SetWorkspaces(workspaces);
}
// switch to it
activate_workspace(next); activate_workspace(next);
if (takeMeThere && (workspaces != B_ALL_WORKSPACES)) {
workspaces &= ~(1 << current);
SetWorkspaces(workspaces);
}
}
break; break;
} }
@ -2692,7 +2711,8 @@ BWindow::_InitData(BRect frame, const char* title, window_look look,
new BMessage(B_HIDE_APPLICATION), NULL); new BMessage(B_HIDE_APPLICATION), NULL);
// Workspace modifier keys // Workspace modifier keys
BMessage* message = new BMessage(_SWITCH_WORKSPACE_); BMessage* message;
message = new BMessage(_SWITCH_WORKSPACE_);
message->AddInt32("delta_x", -1); message->AddInt32("delta_x", -1);
AddShortcut(B_LEFT_ARROW, B_COMMAND_KEY | B_CONTROL_KEY, message, NULL); AddShortcut(B_LEFT_ARROW, B_COMMAND_KEY | B_CONTROL_KEY, message, NULL);
@ -2708,6 +2728,26 @@ BWindow::_InitData(BRect frame, const char* title, window_look look,
message->AddInt32("delta_y", 1); message->AddInt32("delta_y", 1);
AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY | B_CONTROL_KEY, message, NULL); AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY | B_CONTROL_KEY, message, NULL);
message = new BMessage(_SWITCH_WORKSPACE_);
message->AddBool("take_me_there", true);
message->AddInt32("delta_x", -1);
AddShortcut(B_LEFT_ARROW, B_COMMAND_KEY | B_CONTROL_KEY | B_SHIFT_KEY, message, NULL);
message = new BMessage(_SWITCH_WORKSPACE_);
message->AddBool("take_me_there", true);
message->AddInt32("delta_x", 1);
AddShortcut(B_RIGHT_ARROW, B_COMMAND_KEY | B_CONTROL_KEY | B_SHIFT_KEY, message, NULL);
message = new BMessage(_SWITCH_WORKSPACE_);
message->AddBool("take_me_there", true);
message->AddInt32("delta_y", -1);
AddShortcut(B_UP_ARROW, B_COMMAND_KEY | B_CONTROL_KEY | B_SHIFT_KEY, message, NULL);
message = new BMessage(_SWITCH_WORKSPACE_);
message->AddBool("take_me_there", true);
message->AddInt32("delta_y", 1);
AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY | B_CONTROL_KEY | B_SHIFT_KEY, message, NULL);
// We set the default pulse rate, but we don't start the pulse // We set the default pulse rate, but we don't start the pulse
fPulseRate = 500000; fPulseRate = 500000;
fPulseRunner = NULL; fPulseRunner = NULL;