Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#307086

Browse Source 
r=Peter Weilbacher, sr=mkaply (OS/2 only)
Patch from Rich Walsh - OS/2 drag drop is broken
This commit is contained in:
mkaply%us.ibm.com 2005-09-13 14:50:33 +00:00
parent 974b0c8542
commit f29fd71703
2 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
widget/src/os2/nsWindow.cpp
View File

@ -433,47 +433,32 @@ PRBool nsWindow::ConvertStatus(nsEventStatus aStatus)
//-------------------------------------------------------------------------
void nsWindow::InitEvent(nsGUIEvent& event, nsPoint* aPoint)
{
NS_ADDREF(event.widget);
NS_ADDREF(event.widget);
if (nsnull == aPoint) { // use the point from the event
// for most events, get the message position; for drag events,
// msg position may be incorrect, so get the current position instead
POINTL ptl;
if (CheckDragStatus(ACTION_PTRPOS, 0))
WinQueryPointerPos( HWND_DESKTOP, &ptl);
else
WinQueryMsgPos( 0/*hab*/, &ptl);
WinMapWindowPoints( HWND_DESKTOP, mWnd, &ptl, 1);
// if no point was supplied, calculate it
if (nsnull == aPoint) {
// for most events, get the message position; for drag events,
// msg position may be incorrect, so get the current position instead
POINTL ptl;
if (CheckDragStatus(ACTION_PTRPOS, 0))
WinQueryPointerPos( HWND_DESKTOP, &ptl);
else
WinQueryMsgPos( 0/*hab*/, &ptl);
#if 0
printf("++++++++++nsWindow::InitEvent (!pt) mapped point = %ld, %ld\n", ptl.x, ptl.y);
#endif
WinMapWindowPoints( HWND_DESKTOP, mWnd, &ptl, 1);
PM2NS( ptl);
event.refPoint.x = ptl.x;
event.refPoint.y = ptl.y;
}
else
// use the point override if provided
{
event.refPoint.x = aPoint->x;
event.refPoint.y = aPoint->y;
}
PM2NS( ptl);
event.refPoint.x = ptl.x;
event.refPoint.y = ptl.y;
#if 0
printf("++++++++++nsWindow::InitEvent (!pt) converted point = %ld, %ld\n", ptl.x, ptl.y);
#endif
}
else
{ // use the point override if provided
event.refPoint.x = aPoint->x;
event.refPoint.y = aPoint->y;
#if 0
printf("++++++++++nsWindow::InitEvent point = %ld, %ld\n", aPoint->x, aPoint->y);
#endif
}
event.time = WinQueryMsgTime( 0/*hab*/);
/* OS2TODO
mLastPoint.x = event.refPoint.x;
mLastPoint.y = event.refPoint.y;
*/
event.time = WinQueryMsgTime( 0/*hab*/);
return;
}
//-------------------------------------------------------------------------
@ -550,10 +535,32 @@ PRBool nsWindow::DispatchAppCommandEvent(PRUint32 aEventCommand)
InitEvent(event);
event.appCommand = NS_APPCOMMAND_START + aEventCommand;
DispatchWindowEvent(&event);
PRBool result = DispatchWindowEvent(&event);
NS_RELEASE(event.widget);
return NS_OK;
return result;
}
//-------------------------------------------------------------------------
//
// Dispatch DragDrop (target) event
//
//-------------------------------------------------------------------------
PRBool nsWindow::DispatchDragDropEvent(PRUint32 aMsg)
{
nsMouseEvent event(PR_TRUE, aMsg, this, nsMouseEvent::eReal);
InitEvent(event);
event.isShift = WinIsKeyDown(VK_SHIFT);
event.isControl = WinIsKeyDown(VK_CTRL);
event.isAlt = WinIsKeyDown(VK_ALT) || WinIsKeyDown(VK_ALTGRAF);
event.isMeta = PR_FALSE;
PRBool result = DispatchWindowEvent(&event);
NS_RELEASE(event.widget);
return result;
}
//-------------------------------------------------------------------------
@ -3924,10 +3931,10 @@ PRBool nsWindow::OnDragDropMsg(ULONG msg, MPARAM mp1, MPARAM mp2, MRESULT &mr)
mDragStatus = gDragStatus = (dragFlags & DND_DragStatus);
if (dragFlags & DND_DispatchEnterEvent)
DispatchStandardEvent(NS_DRAGDROP_ENTER);
DispatchDragDropEvent(NS_DRAGDROP_ENTER);
if (dragFlags & DND_DispatchEvent)
DispatchStandardEvent(eventType);
DispatchDragDropEvent(eventType);
if (dragFlags & DND_GetDragoverResult)
dragSession->GetDragoverResult(mr);

1
widget/src/os2/nsWindow.h
View File

@ -320,6 +320,7 @@ protected:
virtual PRBool DispatchWindowEvent(nsGUIEvent*event, nsEventStatus &aStatus);
PRBool DispatchStandardEvent( PRUint32 aMsg);
PRBool DispatchAppCommandEvent(PRUint32 aEventCommand);
PRBool DispatchDragDropEvent( PRUint32 aMsg);
virtual PRBool DispatchMouseEvent( PRUint32 aEventType, MPARAM mp1, MPARAM mp2);
virtual PRBool DispatchResizeEvent( PRInt32 aClientX, PRInt32 aClientY);
void GetNonClientBounds(nsRect &aRect);