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

More scrolling love, with some other window goodness. [not part of build]

Browse Source
This commit is contained in:
pinkerton%netscape.com 2001-11-19 15:02:23 +00:00
parent a1ad05dd75
commit 15dcc08c87
6 changed files with 67 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,11 +383,11 @@ void* nsChildView::GetNativeData(PRUint32 aDataType)
}
case NS_NATIVE_OFFSETX:
retVal = (void*)mBounds.x;
retVal = 0;
break;
case NS_NATIVE_OFFSETY:
retVal = (void*)mBounds.y;
retVal = 0;
break;
#if 0

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

@ -191,14 +191,14 @@ protected:
#endif
#if 0
PRBool mIsDialog; // true if the window is a dialog
auto_ptr<nsMacEventHandler> mMacEventHandler;
nsIWidget *mOffsetParent;
PRBool mAcceptsActivation;
PRBool mIsActive;
PRBool mZoomOnShow;
#endif // COCOA
nsIWidget* mOffsetParent; // if we're a popup, this is our parent [WEAK]
PRBool mIsDialog; // true if the window is a dialog
PRBool mIsResizing; // we originated the resize, prevent infinite recursion
PRBool mWindowMadeHere; // true if we created the window, false for embedding
NSWindow* mWindow; // our cocoa window [STRONG]

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

@ -298,7 +298,10 @@ nsCocoaWindow::nsCocoaWindow()
, mIsActive(PR_FALSE)
, mZoomOnShow(PR_FALSE)
#endif
: mIsResizing(PR_FALSE)
:
mOffsetParent(nsnull)
, mIsDialog(PR_FALSE)
, mIsResizing(PR_FALSE)
, mWindowMadeHere(PR_FALSE)
, mWindow(nil)
{
@ -367,13 +370,29 @@ nsresult nsCocoaWindow::StandardCreate(nsIWidget *aParent,
Inherited::BaseCreate ( aParent, aRect, aHandleEventFunction, aContext, aAppShell,
aToolkit, aInitData );
if ( !aParent ) {
if ( !aNativeParent ) {
mOffsetParent = aParent;
nsWindowType windowType = eWindowType_toplevel;
if (aInitData) {
mWindowType = aInitData->mWindowType;
// if a toplevel window was requested without a titlebar, use a dialog windowproc
if (aInitData->mWindowType == eWindowType_toplevel &&
(aInitData->mBorderStyle == eBorderStyle_none ||
aInitData->mBorderStyle != eBorderStyle_all && !(aInitData->mBorderStyle & eBorderStyle_title)))
windowType = eWindowType_dialog;
}
else
mWindowType = (mIsDialog ? eWindowType_dialog : eWindowType_toplevel);
// create the cocoa window
NSRect rect;
rect.origin.x = rect.origin.y = 1.0;
rect.size.width = rect.size.height = 50.0;
rect.size.width = rect.size.height = 1.0;
unsigned int features = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask
| NSResizableWindowMask;
if ( mWindowType == eWindowType_popup || mWindowType == eWindowType_invisible )
features = 0;
mWindow = [[NSWindow alloc] initWithContentRect:rect styleMask:features
backing:NSBackingStoreBuffered defer:NO];
@ -389,7 +408,7 @@ nsresult nsCocoaWindow::StandardCreate(nsIWidget *aParent,
mDelegate = [[WindowDelegate alloc] initWithGeckoWindow:this];
[mWindow setDelegate:mDelegate];
mWindowMadeHere = PR_TRUE;
mWindowMadeHere = PR_TRUE;
}
#if 0
@ -741,7 +760,7 @@ nsCocoaWindow :: WindowEventHandler ( EventHandlerCallRef inHandlerChain, EventR
// Create a nsCocoaWindow using a native window provided by the application
//
//-------------------------------------------------------------------------
NS_IMETHODIMP nsCocoaWindow::Create(nsNativeWidget aNativeParent, // this is a windowPtr
NS_IMETHODIMP nsCocoaWindow::Create(nsNativeWidget aNativeParent,
const nsRect &aRect,
EVENT_CALLBACK aHandleEventFunction,
nsIDeviceContext *aContext,
@ -755,7 +774,7 @@ NS_IMETHODIMP nsCocoaWindow::Create(nsNativeWidget aNativeParent, // this is a
}
NS_IMETHODIMP nsCocoaWindow::Create(nsIWidget* aNativeParent, // this is a windowPtr
NS_IMETHODIMP nsCocoaWindow::Create(nsIWidget* aParent,
const nsRect &aRect,
EVENT_CALLBACK aHandleEventFunction,
nsIDeviceContext *aContext,
@ -763,9 +782,9 @@ NS_IMETHODIMP nsCocoaWindow::Create(nsIWidget* aNativeParent, // this is a win
nsIToolkit *aToolkit,
nsWidgetInitData *aInitData)
{
return(StandardCreate(nsnull, aRect, aHandleEventFunction,
return(StandardCreate(aParent, aRect, aHandleEventFunction,
aContext, aAppShell, aToolkit, aInitData,
aNativeParent));
nsnull));
}
@ -971,19 +990,38 @@ NS_IMETHODIMP nsCocoaWindow::ConstrainPosition(PRInt32 *aX, PRInt32 *aY)
// Move
//-------------------------------------------------------------------------
NS_IMETHODIMP nsCocoaWindow::Move(PRInt32 aX, PRInt32 aY)
{
// the assumption is that (aX,aY) is a point in window coordinates. Convert
// to screen coordinates before calling |setFrameTopLeftPoint|.
if ( mWindow ) {
{
if ( mWindow ) {
// if we're a popup, we have to convert from our parent widget's coord
// system to the global coord system first because the (x,y) we're given
// is in its coordinate system.
if ( mWindowType == eWindowType_popup ) {
nsRect localRect, globalRect;
localRect.x = aX;
localRect.y = aY;
if ( mOffsetParent ) {
mOffsetParent->WidgetToScreen(localRect,globalRect);
aX=globalRect.x;
aY=globalRect.y;
}
}
NSPoint coord = {aX, aY};
coord = [mWindow convertBaseToScreen:coord];
printf("moving to %d %d\n", aX, aY);
//coord = [mWindow convertBaseToScreen:coord];
printf("moving to %d %d. screen coords %f %f\n", aX, aY, coord.x, coord.y);
//FIXME -- ensure it's on the screen. Cocoa automatically corrects for windows
// with title bars, but for other windows, we have to do this...
// the point we have assumes that the screen origin is the top-left. Well,
// it's not. Use the screen object to convert.
//FIXME -- doesn't work on monitors other than primary
NSRect screenRect = [[NSScreen mainScreen] frame];
coord.y = (screenRect.origin.y + screenRect.size.height) - coord.y;
printf("final coords %f %f\n", coord.x, coord.y);
printf("- window coords before %f %f\n", [mWindow frame].origin.x, [mWindow frame].origin.y);
[mWindow setFrameTopLeftPoint:coord];
printf("- window coords after %f %f\n", [mWindow frame].origin.x, [mWindow frame].origin.y);
}
#if 0
@ -1275,7 +1313,10 @@ printf("resizing to %d %d\n", aWidth, aHeight);
if ( mWindow ) {
NSRect newBounds = [mWindow frame];
newBounds.size.width = aWidth;
newBounds.size.height = aHeight + kTitleBarHeight; // add height of title bar
if ( mWindowType == eWindowType_popup )
newBounds.size.height = aHeight;
else
newBounds.size.height = aHeight + kTitleBarHeight; // add height of title bar
StartResizing();
[mWindow setFrame:newBounds display:NO];
StopResizing();

2
widget/src/cocoa/nsScrollbar.h
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

7
widget/src/cocoa/nsWidgetFactory.mm
View File

@ -89,7 +89,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMenuBar)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMenu)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMenuItem)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsScrollbar)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsVertScrollbar)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHorizScrollbar)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
//NS_GENERIC_FACTORY_CONSTRUCTOR(nsFileSpecWithUIImpl)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
@ -181,11 +182,11 @@ static nsModuleComponentInfo components[] =
{ "Horiz Scrollbar",
NS_HORZSCROLLBAR_CID,
"@mozilla.org/widgets/horizscroll/mac;1",
nsScrollbarConstructor },
nsHorizScrollbarConstructor },
{ "Vert Scrollbar",
NS_VERTSCROLLBAR_CID,
"@mozilla.org/widgets/vertscroll/mac;1",
nsScrollbarConstructor },
nsVertScrollbarConstructor },
};
NS_IMPL_NSGETMODULE(nsWidgetModule, components)