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

* Dropped messages come in a _MESSAGE_DROPPED_ "packet", and were unpacked much too

Browse Source 
late, in DispatchMessage(), working around all eventually installed message filters.
  This fixes the odd "cannot drop files into file panel" bug mentioned in bug #669.
* They are now handled in _DetermineTarget() and _SanitizeMessage().
* _SanitizeMessage() is now called earlier, so that no user code can see them before;
  even though this might give you wrong MouseDown() coordinates in combination with
  a redirecting message filter, I think that's exactly what would happen in this
  situation under R5 as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17839 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-06-14 18:27:10 +00:00
parent e39da397f5
commit 7477c792d5
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1144,20 +1144,6 @@ FrameMoved(origin);
msg->SendReply(B_MESSAGE_NOT_UNDERSTOOD);
break;
}
case _MESSAGE_DROPPED_:
{
if (fLastMouseMovedView)
target = fLastMouseMovedView;
uint32 originalWhat;
if (msg->FindInt32("_original_what", (int32*)&originalWhat) == B_OK) {
msg->what = originalWhat;
msg->RemoveName("_original_what");
}
BLooper::DispatchMessage(msg, target);
break;
}
default:
BLooper::DispatchMessage(msg, target);
@ -2536,6 +2522,9 @@ BWindow::task_looper()
while (_UnpackMessage(cookie, &fLastMessage, &handler, &usePreferred)) {
// if there is no target handler, the message is dropped
if (handler != NULL) {
if (handler != NULL)
_SanitizeMessage(fLastMessage, handler, usePreferred);
// Is this a scripting message?
if (fLastMessage->HasSpecifiers()) {
int32 index = 0;
@ -2547,10 +2536,8 @@ BWindow::task_looper()
if (handler != NULL)
handler = _TopLevelFilter(fLastMessage, handler);
if (handler != NULL) {
_SanitizeMessage(fLastMessage, handler, usePreferred);
if (handler != NULL)
DispatchMessage(fLastMessage, handler);
}
}
// Delete the current message
@ -2780,6 +2767,11 @@ BWindow::_DetermineTarget(BMessage *message, BHandler *target)
// TODO: test wether R5 will let BView dispatch these messages
return this;
case _MESSAGE_DROPPED_:
if (fLastMouseMovedView != NULL)
return fLastMouseMovedView;
break;
default:
break;
}
@ -2891,6 +2883,11 @@ BWindow::_UnpackMessage(unpack_cookie& cookie, BMessage** _message, BHandler** _
}
/*!
Some messages don't get to the window in a shape an application should see.
This method is supposed to give a message the last grinding before
it's acceptable for the receiving application.
*/
void
BWindow::_SanitizeMessage(BMessage* message, BHandler* target, bool usePreferred)
{
@ -2901,6 +2898,7 @@ BWindow::_SanitizeMessage(BMessage* message, BHandler* target, bool usePreferred
case B_MOUSE_MOVED:
case B_MOUSE_UP:
case B_MOUSE_DOWN:
{
BPoint where;
if (message->FindPoint("screen_where", &where) != B_OK)
break;
@ -2943,6 +2941,17 @@ BWindow::_SanitizeMessage(BMessage* message, BHandler* target, bool usePreferred
}
}
break;
}
case _MESSAGE_DROPPED_:
{
uint32 originalWhat;
if (message->FindInt32("_original_what", (int32*)&originalWhat) == B_OK) {
message->what = originalWhat;
message->RemoveName("_original_what");
}
break;
}
}
}