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

BWindow::_DetermineTarget() now defaults to the window, instead of no target at

Browse Source 
all in case the window doesn't have a current focus view.
That allows shortcuts like Command+q/w to work again.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15920 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-01-11 22:30:41 +00:00
parent 74ae324849
commit 54354618d5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Window.cpp
+7 -1
View File
@@ -2501,6 +2501,9 @@ BWindow::_SetFocus(BView *focusView, bool notifyInputServer)
BHandler * BHandler *
BWindow::_DetermineTarget(BMessage *message, BHandler *target) BWindow::_DetermineTarget(BMessage *message, BHandler *target)
{ {
if (target == NULL)
target = this;
switch (message->what) { switch (message->what) {
case B_KEY_DOWN: case B_KEY_DOWN:
case B_KEY_UP: case B_KEY_UP:
@@ -2519,7 +2522,9 @@ BWindow::_DetermineTarget(BMessage *message, BHandler *target)
case B_UNMAPPED_KEY_UP: case B_UNMAPPED_KEY_UP:
case B_MODIFIERS_CHANGED: case B_MODIFIERS_CHANGED:
// these messages should be dispatched by the focus view // these messages should be dispatched by the focus view
return CurrentFocus(); if (CurrentFocus() != NULL)
return CurrentFocus();
break;
case B_MOUSE_DOWN: case B_MOUSE_DOWN:
case B_MOUSE_UP: case B_MOUSE_UP:
@@ -2735,6 +2740,7 @@ BWindow::_HandleKeyDown(char key, uint32 modifiers)
if ((modifiers & B_COMMAND_KEY) != 0) { if ((modifiers & B_COMMAND_KEY) != 0) {
// Command+q has been pressed, so, we will quit // Command+q has been pressed, so, we will quit
// the shortcut mechanism doesn't allow handlers outside the window // the shortcut mechanism doesn't allow handlers outside the window
// TODO: in BeOS, this shortcut can be removed!
if (key == 'Q' || key == 'q') { if (key == 'Q' || key == 'q') {
be_app->PostMessage(B_QUIT_REQUESTED); be_app->PostMessage(B_QUIT_REQUESTED);
return true; return true;