Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-26 18:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix insertion point wackiness due to not sending top-level window gecko activation events. Also some cleanup. b=334551 r=mento

Browse Source
This commit is contained in:
joshmoz%gmail.com 2006-04-21 20:35:00 +00:00
parent f207e836f4
commit 59898c082e
3 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widget/src/cocoa/nsChildView.mm
View File

@ -1593,7 +1593,7 @@ NS_IMETHODIMP nsChildView::DispatchEvent(nsGUIEvent* event, nsEventStatus& aStat
nsIWidget* aWidget = event->widget;
NS_IF_ADDREF(aWidget);
if (nsnull != mMenuListener){
if (mMenuListener != nsnull) {
if (NS_MENU_EVENT == event->eventStructType)
aStatus = mMenuListener->MenuSelected( static_cast<nsMenuEvent&>(*event) );
}

5
widget/src/cocoa/nsCocoaWindow.h
View File

@ -156,11 +156,6 @@ public:
// nsIKBStateControl interface
NS_IMETHOD ResetInputState();
void MoveToGlobalPoint(PRInt32 aX, PRInt32 aY);
void IsActive(PRBool* aActive);
void SetIsActive(PRBool aActive);
protected:
nsIWidget* mParent; // if we're a popup, this is our parent [WEAK]

55
widget/src/cocoa/nsCocoaWindow.mm
View File

@ -549,22 +549,6 @@ void nsCocoaWindow::CalculateAndSetZoomedSize()
} // CalculateAndSetZoomedSize
//-------------------------------------------------------------------------
//
// Resize this window to a point given in global (screen) coordinates. This
// differs from simple Move(): that method makes JavaScript place windows
// like other browsers: it puts the top-left corner of the outer edge of the
// window border at the given coordinates, offset from the menubar.
// MoveToGlobalPoint expects the top-left corner of the portrect, which
// is inside the border, and is not offset by the menubar height.
//
//-------------------------------------------------------------------------
void nsCocoaWindow::MoveToGlobalPoint(PRInt32 aX, PRInt32 aY)
{
}
NS_IMETHODIMP nsCocoaWindow::Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
{
Move(aX, aY);
@ -664,18 +648,6 @@ NS_IMETHODIMP nsCocoaWindow::ResetInputState()
}
void nsCocoaWindow::SetIsActive(PRBool aActive)
{
// mIsActive = aActive;
}
void nsCocoaWindow::IsActive(PRBool* aActive)
{
// *aActive = mIsActive;
}
//-------------------------------------------------------------------------
//
// Invokes callback and ProcessEvent method on Event Listener object
@ -814,10 +786,16 @@ NS_IMETHODIMP nsCocoaWindow::CaptureRollupEvents(nsIRollupListener * aListener,
myMenuBar->Paint();
}
nsGUIEvent guiEvent(PR_TRUE, NS_GOTFOCUS, mGeckoWindow);
guiEvent.time = PR_IntervalNow();
// send focus/activation events
nsEventStatus status = nsEventStatus_eIgnore;
mGeckoWindow->DispatchEvent(&guiEvent, status);
nsGUIEvent focusGuiEvent(PR_TRUE, NS_GOTFOCUS, mGeckoWindow);
focusGuiEvent.time = PR_IntervalNow();
mGeckoWindow->DispatchEvent(&focusGuiEvent, status);
nsGUIEvent activateGuiEvent(PR_TRUE, NS_ACTIVATE, mGeckoWindow);
activateGuiEvent.time = PR_IntervalNow();
mGeckoWindow->DispatchEvent(&activateGuiEvent, status);
}
@ -829,15 +807,20 @@ NS_IMETHODIMP nsCocoaWindow::CaptureRollupEvents(nsIRollupListener * aListener,
nsCOMPtr<nsIMenuBar> hiddenWindowMenuBar = GetHiddenWindowMenuBar();
if (hiddenWindowMenuBar) {
// printf("painting hidden window menu bar due to nsCocoaWindow::Show(false)\n");
// printf("painting hidden window menu bar due to window losing main status\n");
hiddenWindowMenuBar->Paint();
}
// tell Gecko that we lost focus
nsGUIEvent guiEvent(PR_TRUE, NS_LOSTFOCUS, mGeckoWindow);
guiEvent.time = PR_IntervalNow();
// send focus/activation events
nsEventStatus status = nsEventStatus_eIgnore;
mGeckoWindow->DispatchEvent(&guiEvent, status);
nsGUIEvent deactivateGuiEvent(PR_TRUE, NS_DEACTIVATE, mGeckoWindow);
deactivateGuiEvent.time = PR_IntervalNow();
mGeckoWindow->DispatchEvent(&deactivateGuiEvent, status);
nsGUIEvent lostFocusGuiEvent(PR_TRUE, NS_LOSTFOCUS, mGeckoWindow);
lostFocusGuiEvent.time = PR_IntervalNow();
mGeckoWindow->DispatchEvent(&lostFocusGuiEvent, status);
}