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

notify container of position upon return to user state and softwire window border widths. bug 193295 r=pinkerton,sfraser a=asa

Browse Source
This commit is contained in:
danm%netscape.com 2003-02-19 23:20:34 +00:00
parent e659a2527e
commit 5fa8726542
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
widget/src/mac/nsMacWindow.cpp
View File

@ -90,17 +90,15 @@ long CallSystemWDEF ( short inCode, WindowPtr inWindow, short inMessage, long in
#define kWindowPositionSlop 20
// ¥¥¥ TODO: these should come from the system, not be hard-coded. What if I'm running
// an elaborate theme with wide window borders?
// These are only initial guesses. Real values are filled in
// after window creation.
const short kWindowTitleBarHeight = 22;
const short kWindowMarginWidth = 6;
const short kDialogTitleBarHeight = 26;
const short kDialogMarginWidth = 6;
#pragma mark -
pascal OSErr
nsMacWindow :: DragTrackingHandler ( DragTrackingMessage theMessage, WindowPtr theWindow,
void *handlerRefCon, DragReference theDrag)
@ -112,7 +110,6 @@ nsMacWindow :: DragTrackingHandler ( DragTrackingMessage theMessage, WindowPtr t
if ( !theWindow || !windowEventSink )
return dragNotAcceptedErr;
nsresult rv = NS_OK;
switch ( theMessage ) {
case kDragTrackingEnterHandler:
@ -188,15 +185,14 @@ NS_IMPL_ISUPPORTS_INHERITED4(nsMacWindow, Inherited, nsIEventSink, nsPIWidgetMac
//-------------------------------------------------------------------------
nsMacWindow::nsMacWindow() : Inherited()
, mWindowMadeHere(PR_FALSE)
, mIsDialog(PR_FALSE)
, mIsSheet(PR_FALSE)
, mIgnoreDeactivate(PR_FALSE)
, mMacEventHandler(nsnull)
, mAcceptsActivation(PR_TRUE)
, mIsActive(PR_FALSE)
, mZoomOnShow(PR_FALSE)
, mZooming(PR_FALSE)
, mResizeIsFromUs(PR_FALSE)
, mMacEventHandler(nsnull)
#if !TARGET_CARBON
, mPhantomScrollbar(nsnull)
, mPhantomScrollbarData(nsnull)
@ -208,6 +204,8 @@ nsMacWindow::nsMacWindow() : Inherited()
// create handlers for drag&drop
mDragTrackingHandlerUPP = NewDragTrackingHandlerUPP(DragTrackingHandler);
mDragReceiveHandlerUPP = NewDragReceiveHandlerUPP(DragReceiveHandler);
mBoundsOffset.v = kWindowTitleBarHeight; // initial guesses
mBoundsOffset.h = kWindowMarginWidth;
}
@ -292,7 +290,7 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent,
mWindowType = eWindowType_dialog;
}
else
mWindowType = (mIsDialog ? eWindowType_dialog : eWindowType_toplevel);
mWindowType = eWindowType_toplevel;
short wDefProcID = kWindowDocumentProc;
Boolean goAwayFlag = false;
@ -469,6 +467,12 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent,
}
mWindowPtr = ::NewCWindow(nil, &wRect, "\p", false, wDefProcID, (WindowRef)-1, goAwayFlag, (long)nsnull);
mWindowMadeHere = PR_TRUE;
Rect content, structure;
::GetWindowBounds(mWindowPtr, kWindowStructureRgn, &structure);
::GetWindowBounds(mWindowPtr, kWindowContentRgn, &content);
mBoundsOffset.v = content.top - structure.top;
mBoundsOffset.h = content.left - structure.left;
}
else
{
@ -1107,7 +1111,6 @@ NS_IMETHODIMP nsMacWindow::Move(PRInt32 aX, PRInt32 aY)
StPortSetter setOurPortForLocalToGlobal ( mWindowPtr );
if (eWindowType_popup == mWindowType) {
PRInt32 xOffset=0,yOffset=0;
nsRect localRect,globalRect;
// convert to screen coordinates
@ -1150,13 +1153,8 @@ NS_IMETHODIMP nsMacWindow::Move(PRInt32 aX, PRInt32 aY)
Rect portBounds;
::GetWindowPortBounds(mWindowPtr, &portBounds);
if (mIsDialog) {
aX += kDialogMarginWidth;
aY += kDialogTitleBarHeight;
} else {
aX += kWindowMarginWidth;
aY += kWindowTitleBarHeight;
}
aX += mBoundsOffset.h;
aY += mBoundsOffset.v;
nsCOMPtr<nsIScreenManager> screenmgr = do_GetService(sScreenManagerContractID);
if (screenmgr) {
@ -1299,6 +1297,9 @@ nsMacWindow::UserStateForResize()
// finally, reset our internal state to match
nsBaseWidget::SetSizeMode(nsSizeMode_Normal);
// Tell container window we've moved. We stopped reporting move events
// when we were in the StandardState.
ReportMoveEvent();
}
@ -1457,14 +1458,7 @@ void nsMacWindow::MoveToGlobalPoint(PRInt32 aX, PRInt32 aY)
}
}
if (mIsDialog) {
aX -= kDialogMarginWidth;
aY -= kDialogTitleBarHeight;
} else {
aX -= kWindowMarginWidth;
aY -= kWindowTitleBarHeight;
}
Move(aX, aY);
Move(aX-mBoundsOffset.h, aY-mBoundsOffset.v);
}
//-------------------------------------------------------------------------
@ -1558,10 +1552,7 @@ NS_IMETHODIMP nsMacWindow::GetScreenBounds(nsRect &aRect) {
}
}
if (mIsDialog)
aRect.MoveBy(-kDialogMarginWidth, -kDialogTitleBarHeight-yAdjust);
else
aRect.MoveBy(-kWindowMarginWidth, -kWindowTitleBarHeight-yAdjust);
aRect.MoveBy(-mBoundsOffset.h, -mBoundsOffset.v-yAdjust);
return NS_OK;
}

2
widget/src/mac/nsMacWindow.h
View File

@ -154,7 +154,6 @@ protected:
#endif
PRPackedBool mWindowMadeHere; // true if we created the window
PRPackedBool mIsDialog; // true if the window is a dialog
PRPackedBool mIsSheet; // true if the window is a sheet (Mac OS X)
PRPackedBool mIgnoreDeactivate; // true if this window has a (Mac OS X) sheet opening
PRPackedBool mAcceptsActivation;
@ -162,6 +161,7 @@ protected:
PRPackedBool mZoomOnShow;
PRPackedBool mZooming;
PRPackedBool mResizeIsFromUs; // we originated the resize, prevent infinite recursion
Point mBoundsOffset; // offset from window structure to content
auto_ptr<nsMacEventHandler> mMacEventHandler;
nsIWidget *mOffsetParent;