i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Use Shift instead of Option as modifier to load workspace settings, as it conflicts with option+N used to open a new

Browse Source 
terminal
 * Also ensure that the terminal end up on the current workspace if there is a problem with the settings or the key isn't 
pressed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38223 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-08-18 09:57:17 +00:00
parent b234b3fc4e
commit e20a602919
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermApp.cpp
+4 -1
View File
@@ -79,6 +79,7 @@ TermApp::TermApp()
int l = (j * 16) + 50; int l = (j * 16) + 50;
fTermFrame.Set(k, l, k + 50, k + 50); fTermFrame.Set(k, l, k + 50, k + 50);
fTermWorkspaces = B_CURRENT_WORKSPACE;
} }
} }
@@ -288,8 +289,10 @@ TermApp::_LoadWindowPosition(BRect* frame, uint32* workspaces)
status = position.FindInt32("workspaces", fWindowNumber - 1, &_workspaces); status = position.FindInt32("workspaces", fWindowNumber - 1, &_workspaces);
if (status != B_OK) if (status != B_OK)
return status; return status;
if (modifiers() & B_OPTION_KEY) if (modifiers() & B_SHIFT_KEY)
*workspaces = _workspaces; *workspaces = _workspaces;
else
*workspaces = B_CURRENT_WORKSPACE;
printf("loading settings ok\n"); printf("loading settings ok\n");
return B_OK; return B_OK;