Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-08 12:22:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed mouseup messaging

Browse Source
This commit is contained in:
dcone%netscape.com 1998-09-01 20:24:54 +00:00
parent b4f15e862b
commit acd663d376
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
widget/src/mac/nsButton.cpp
View File

@ -141,6 +141,7 @@ void nsButton::Create(nsIWidget *aParent,
mEventCallback = aHandleEventFunction;
mMouseDownInButton = PR_FALSE;
mWidgetArmed = PR_FALSE;
//InitCallbacks("nsButton");
InitDeviceContext(mContext, (nsNativeWidget)mWindowPtr);
@ -239,14 +240,8 @@ void nsButton::GetLabel(nsString& aBuffer)
//-------------------------------------------------------------------------
PRBool nsButton::OnPaint(nsPaintEvent &aEvent)
{
nsRect therect;
Rect macrect;
//if (mControl)
//Draw1Control(mControl);
DrawWidget(FALSE);
DrawWidget(FALSE);
return PR_FALSE;
}
@ -290,36 +285,30 @@ nsButton::PtInWindow(PRInt32 aX,PRInt32 aY)
PRBool
nsButton::DispatchMouseEvent(nsMouseEvent &aEvent)
{
Point pt;
PRBool result;
result = nsWindow::DispatchMouseEvent(aEvent);
switch (aEvent.message)
{
case NS_MOUSE_LEFT_BUTTON_DOWN:
pt.h = aEvent.point.x;
pt.v = aEvent.point.y;
if (mControl)
{
// Draw the button
mMouseDownInButton = PR_TRUE;
DrawWidget(PR_TRUE);
nsWindow::DispatchMouseEvent(aEvent);
}
mMouseDownInButton = PR_TRUE;
DrawWidget(PR_TRUE);
result = nsWindow::DispatchMouseEvent(aEvent);
break;
case NS_MOUSE_LEFT_BUTTON_UP:
mMouseDownInButton = PR_FALSE;
DrawWidget(PR_TRUE);
nsWindow::DispatchMouseEvent(aEvent);
if(mWidgetArmed==PR_TRUE)
result = nsWindow::DispatchMouseEvent(aEvent);
break;
case NS_MOUSE_EXIT:
DrawWidget(PR_FALSE);
nsWindow::DispatchMouseEvent(aEvent);
mWidgetArmed = PR_FALSE;
result = nsWindow::DispatchMouseEvent(aEvent);
break;
case NS_MOUSE_ENTER:
DrawWidget(PR_TRUE);
nsWindow::DispatchMouseEvent(aEvent);
mWidgetArmed = PR_TRUE;
result = nsWindow::DispatchMouseEvent(aEvent);
break;
}
@ -337,7 +326,6 @@ void
nsButton::DrawWidget(PRBool aMouseInside)
{
nsRect therect;
nsIRenderingContext *drawctx;
Rect macrect;
GrafPtr theport;
RGBColor blackcolor = {0,0,0};
@ -345,7 +333,6 @@ RgnHandle thergn;
GetPort(&theport);
//drawctx = this->GetRenderingContext();
::SetPort(mWindowPtr);
GetBounds(therect);
nsRectToMacRect(therect,macrect);
@ -365,7 +352,6 @@ RgnHandle thergn;
::PenSize(1,1);
::SetClip(thergn);
::SetPort(theport);
//NS_RELEASE(drawctx);
}
//-------------------------------------------------------------------------

1
widget/src/mac/nsButton.h
View File

@ -100,6 +100,7 @@ private:
ControlHandle mControl;
PRBool mMouseDownInButton;
PRBool mWidgetArmed;
};

4
widget/src/mac/nsMacMessagePump.cpp
View File

@ -332,7 +332,7 @@ nsMouseEvent mouseevent;
partcode = FindWindow(aTheEvent->where,&whichwindow);
if(FALSE && gGrabWindow)
if(gGrabWindow)
{
mouseevent.message = NS_MOUSE_LEFT_BUTTON_UP;
mouseevent.widget = (nsWindow *) gGrabWindow;
@ -347,6 +347,8 @@ nsMouseEvent mouseevent;
mouseevent.clickCount = 1;
mouseevent.eventStructType = NS_MOUSE_EVENT;
gGrabWindow->DispatchMouseEvent(mouseevent);
gGrabWindow = nsnull; // mouse grab no longer in effect
return;
}
if(whichwindow!=0)