mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-28 21:28:55 +00:00
339640 Activate/deactivate events being processed twice. r=josh
This commit is contained in:
parent
c35313a483
commit
79471dcc7a
@ -741,7 +741,8 @@ nsMacWindow::WindowEventHandler ( EventHandlerCallRef inHandlerChain, EventRef i
|
||||
if ( gRollupListener && gRollupWidget )
|
||||
gRollupListener->Rollup();
|
||||
gEventDispatchHandler.DispatchGuiEvent(self, NS_DEACTIVATE);
|
||||
retVal = ::CallNextEventHandler(inHandlerChain, inEvent);
|
||||
::CallNextEventHandler(inHandlerChain, inEvent);
|
||||
retVal = noErr; // do default processing, but consume
|
||||
}
|
||||
break;
|
||||
|
||||
@ -750,21 +751,24 @@ nsMacWindow::WindowEventHandler ( EventHandlerCallRef inHandlerChain, EventRef i
|
||||
case kEventWindowExpanded:
|
||||
{
|
||||
gEventDispatchHandler.DispatchGuiEvent(self, NS_ACTIVATE);
|
||||
retVal = ::CallNextEventHandler(inHandlerChain, inEvent);
|
||||
::CallNextEventHandler(inHandlerChain, inEvent);
|
||||
retVal = noErr; // do default processing, but consume
|
||||
}
|
||||
break;
|
||||
|
||||
case kEventWindowActivated:
|
||||
{
|
||||
self->mMacEventHandler->HandleActivateEvent(PR_TRUE);
|
||||
retVal = ::CallNextEventHandler(inHandlerChain, inEvent);
|
||||
::CallNextEventHandler(inHandlerChain, inEvent);
|
||||
retVal = noErr; // do default processing, but consume
|
||||
}
|
||||
break;
|
||||
|
||||
case kEventWindowDeactivated:
|
||||
{
|
||||
self->mMacEventHandler->HandleActivateEvent(PR_FALSE);
|
||||
retVal = ::CallNextEventHandler(inHandlerChain, inEvent);
|
||||
::CallNextEventHandler(inHandlerChain, inEvent);
|
||||
retVal = noErr; // do default processing, but consume
|
||||
}
|
||||
break;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user