Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

using nsCOMPtr and preparing for separation from grippy and toolbar manager with ifdefs.

Browse Source
This commit is contained in:
pinkerton%netscape.com 1998-12-17 22:14:28 +00:00
parent b4d758eba6
commit e1b5a6e2a4
2 changed files with 58 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
widget/src/xpwidgets/nsToolbar.cpp
View File

@ -16,17 +16,24 @@
* Reserved. * Reserved.
*/ */
//
// pinkerton ToDo:
// - remove dependence on toolbar manager and grippy
// - make this talk to DOM for its children.
// - rip out nsIToolbar stuff
//
#include "nsToolbar.h" #include "nsToolbar.h"
#include "nsHTToolbarDataModel.h" #include "nsHTToolbarDataModel.h"
#include "nsWidgetsCID.h" #include "nsWidgetsCID.h"
#include "nspr.h" #include "nspr.h"
#include "nsIWidget.h" #include "nsIWidget.h"
#include "nsIImageButton.h" #include "nsIImageButton.h"
#include "nsIToolbarManager.h"
#include "nsIToolbarItemHolder.h" #include "nsIToolbarItemHolder.h"
#include "nsImageButton.h" #include "nsImageButton.h"
#include "nsRepository.h" #include "nsRepository.h"
#include "nsIDeviceContext.h" #include "nsIDeviceContext.h"
#include "nsCOMPtr.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
@ -34,8 +41,10 @@ static NS_DEFINE_IID(kCToolbarCID, NS_TOOLBAR_CID);
static NS_DEFINE_IID(kCIToolbarIID, NS_ITOOLBAR_IID); static NS_DEFINE_IID(kCIToolbarIID, NS_ITOOLBAR_IID);
static NS_DEFINE_IID(kIToolbarIID, NS_ITOOLBAR_IID); static NS_DEFINE_IID(kIToolbarIID, NS_ITOOLBAR_IID);
#if GRIPPYS_NOT_WIDGETS
#define TAB_WIDTH 9 #define TAB_WIDTH 9
#define TAB_HEIGHT 42 #define TAB_HEIGHT 42
#endif
const PRInt32 gMaxInfoItems = 32; const PRInt32 gMaxInfoItems = 32;
@ -54,23 +63,13 @@ static NS_DEFINE_IID(kIImageButtonListenerIID, NS_IIMAGEBUTTONLISTENER_IID);
static NS_DEFINE_IID(kIContentConnectorIID, NS_ICONTENTCONNECTOR_IID); static NS_DEFINE_IID(kIContentConnectorIID, NS_ICONTENTCONNECTOR_IID);
static nsEventStatus PR_CALLBACK
HandleToolbarEvent(nsGUIEvent *aEvent)
{
nsEventStatus result = nsEventStatus_eIgnore;
nsIContentConnector * toolbar;
if (NS_OK == aEvent->widget->QueryInterface(kIContentConnectorIID,(void**)&toolbar)) {
result = toolbar->HandleEvent(aEvent);
NS_RELEASE(toolbar);
}
return result;
}
//------------------------------------------------------------ //------------------------------------------------------------
class ToolbarLayoutInfo { class ToolbarLayoutInfo {
public: public:
nsIToolbarItem * mItem; nsCOMPtr<nsIToolbarItem> mItem;
PRInt32 mGap; PRInt32 mGap;
PRBool mStretchable; PRBool mStretchable;
@ -79,36 +78,17 @@ public:
mItem = aItem; mItem = aItem;
mGap = aGap; mGap = aGap;
mStretchable = isStretchable; mStretchable = isStretchable;
NS_ADDREF(aItem);
}
virtual ~ToolbarLayoutInfo()
{
NS_RELEASE(mItem);
} }
}; };
/**************************************************************
Now define the token deallocator class...
**************************************************************/
/*class CToolbarItemInfoDeallocator: public nsDequeFunctor{
public:
virtual void* operator()(void* anObject) {
ToolbarLayoutInfo* aItem = (ToolbarLayoutInfo*)anObject;
delete aItem;
return 0;
}
};
static CNavTokenDeallocator gItemInfoKiller;*/
//-------------------------------------------------------------------- //--------------------------------------------------------------------
//-- nsToolbar Constructor //-- nsToolbar Constructor
//-------------------------------------------------------------------- //--------------------------------------------------------------------
nsToolbar::nsToolbar() : nsDataModelWidget(), nsIToolbar(), nsToolbar::nsToolbar() : nsDataModelWidget(), nsIToolbar(),
mImageGroup(nsnull), mDataModel(new nsHTToolbarDataModel) mDataModel(new nsHTToolbarDataModel)
{ {
NS_INIT_REFCNT(); NS_INIT_REFCNT();
@ -123,7 +103,9 @@ nsToolbar::nsToolbar() : nsDataModelWidget(), nsIToolbar(),
mWrapItems = PR_FALSE; mWrapItems = PR_FALSE;
mDoHorizontalLayout = PR_TRUE; mDoHorizontalLayout = PR_TRUE;
#if GRIPPYS_NOT_WIDGETS
mToolbarMgr = nsnull; mToolbarMgr = nsnull;
#endif
//mItemDeque = new nsDeque(gItemInfoKiller); //mItemDeque = new nsDeque(gItemInfoKiller);
mItems = (ToolbarLayoutInfo **) new PRInt32[gMaxInfoItems]; mItems = (ToolbarLayoutInfo **) new PRInt32[gMaxInfoItems];
@ -135,10 +117,9 @@ nsToolbar::~nsToolbar()
{ {
delete mDataModel; delete mDataModel;
#if GRIPPYS_NOT_WIDGETS
NS_IF_RELEASE(mToolbarMgr); NS_IF_RELEASE(mToolbarMgr);
NS_IF_RELEASE(mImageGroup); #endif
//delete mItemDeque;
PRInt32 i; PRInt32 i;
for (i=0;i<mNumItems;i++) { for (i=0;i<mNumItems;i++) {
@ -149,83 +130,38 @@ nsToolbar::~nsToolbar()
//-------------------------------------------------------------------- //--------------------------------------------------------------------
nsresult nsToolbar::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsresult nsToolbar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{ {
nsresult retval = NS_OK;
if (NULL == aInstancePtr) { if (NULL == aInstancePtr) {
return NS_ERROR_NULL_POINTER; retval = NS_ERROR_NULL_POINTER;
} }
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); else if (aIID.Equals(kCIToolbarIID)) {
static NS_DEFINE_IID(kClassIID, kCToolbarCID);
if (aIID.Equals(kCIToolbarIID)) {
*aInstancePtr = (void*) (nsIToolbar *)this; *aInstancePtr = (void*) (nsIToolbar *)this;
AddRef(); AddRef();
return NS_OK;
} }
if (aIID.Equals(kIToolbarItemIID)) { else if (aIID.Equals(kIContentConnectorIID)) {
*aInstancePtr = (void*) (nsIContentConnector *)this;
AddRef();
}
else if (aIID.Equals(kIToolbarItemIID)) {
*aInstancePtr = (void*) (nsIToolbarItem *)this; *aInstancePtr = (void*) (nsIToolbarItem *)this;
AddRef(); AddRef();
return NS_OK;
} }
if (aIID.Equals(kClassIID)) { else
*aInstancePtr = (void*) (nsToolbar *)this; retval = nsDataModelWidget::QueryInterface(aIID, aInstancePtr);
AddRef();
return NS_OK; return retval;
}
if (aIID.Equals(kISupportsIID)) {
*aInstancePtr = (void*) (this);
AddRef();
return NS_OK;
}
return (nsWindow::QueryInterface(aIID, aInstancePtr));
} }
//-----------------------------------------------------
static nsEventStatus PR_CALLBACK static nsEventStatus PR_CALLBACK
HandleTabEvent(nsGUIEvent *aEvent) HandleToolbarEvent(nsGUIEvent *aEvent)
{ {
nsEventStatus result = nsEventStatus_eIgnore; nsEventStatus result = nsEventStatus_eIgnore;
nsCOMPtr<nsIContentConnector> toolbar ( aEvent->widget );
nsIImageButton * button; if ( toolbar )
if (NS_OK == aEvent->widget->QueryInterface(kIImageButtonIID,(void**)&button)) { result = toolbar->HandleEvent(aEvent);
result = button->HandleEvent(aEvent);
if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP) {
nsIWidget * widget;
aEvent->widget->GetClientData((void *&)widget);
if (nsnull != widget) {
nsIToolbar * toolbar;
if (NS_OK == widget->QueryInterface(kIToolbarIID,(void**)&toolbar)) {
nsIToolbarManager * toolbarMgr;
if (NS_OK == toolbar->GetToolbarManager(toolbarMgr)) {
toolbarMgr->CollapseToolbar(toolbar);
NS_RELEASE(toolbarMgr);
}
NS_RELEASE(toolbar);
}
}
}
NS_RELEASE(button);
}
/*switch(aEvent->message) {
case NS_PAINT: {
nsRect pRect;
nsRect r;
nsIWidget * parent;
parent = aEvent->widget->GetParent();
parent->GetBounds(pRect);
aEvent->widget->GetBounds(r);
NS_RELEASE(parent);
nsIRenderingContext *drawCtx = ((nsPaintEvent*)aEvent)->renderingContext;
drawCtx->SetColor(NS_RGB(128,128,128));
drawCtx->SetColor(NS_RGB(255,0,0));
drawCtx->DrawLine(0, pRect.height-1, r.width, pRect.height-1);
drawCtx->DrawLine(0, pRect.height-5, r.width, pRect.height-5);
}
break;
}*/
return result; return result;
} }
@ -245,7 +181,7 @@ nsToolbar :: Create(nsIWidget *aParent,
nsWidgetInitData *aInitData) nsWidgetInitData *aInitData)
{ {
nsresult answer = ChildWindow::Create(aParent, aRect, nsresult answer = ChildWindow::Create(aParent, aRect,
nsnull != aHandleEventFunction ? aHandleEventFunction : HandleToolbarEvent, aHandleEventFunction ? aHandleEventFunction : HandleToolbarEvent,
aContext, aAppShell, aToolkit, aInitData); aContext, aAppShell, aToolkit, aInitData);
if (mDataModel) if (mDataModel)
@ -295,6 +231,7 @@ NS_METHOD nsToolbar::InsertItemAt(nsIToolbarItem* anItem,
PRInt32 downToInx = anIndex + 1; PRInt32 downToInx = anIndex + 1;
for (i=mNumItems;i>downToInx;i--) { for (i=mNumItems;i>downToInx;i--) {
mItems[i] = mItems[i-1]; mItems[i] = mItems[i-1];
} }
// Insert the new widget // Insert the new widget
@ -304,7 +241,6 @@ NS_METHOD nsToolbar::InsertItemAt(nsIToolbarItem* anItem,
} }
mNumItems++; mNumItems++;
NS_ADDREF(anItem);
return NS_OK; return NS_OK;
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
@ -719,6 +655,8 @@ NS_METHOD nsToolbar::SetBorderType(nsToolbarBorderType aBorderType)
return NS_OK; return NS_OK;
} }
#if GRIPPYS_NOT_WIDGETS
//-------------------------------------------------------------------- //--------------------------------------------------------------------
NS_METHOD nsToolbar::SetToolbarManager(nsIToolbarManager * aToolbarManager) NS_METHOD nsToolbar::SetToolbarManager(nsIToolbarManager * aToolbarManager)
{ {
@ -736,6 +674,8 @@ NS_METHOD nsToolbar::GetToolbarManager(nsIToolbarManager *& aToolbarManager)
return NS_OK; return NS_OK;
} }
#endif
//-------------------------------------------------------------------- //--------------------------------------------------------------------
// //
// Resize this component // Resize this component
@ -830,20 +770,16 @@ nsEventStatus nsToolbar::OnPaint(nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect) const nsRect& aDirtyRect)
{ {
nsresult res = NS_OK; nsresult res = NS_OK;
nsIWidget * widget = nsnull;
nsRect r = aDirtyRect; nsRect r = aDirtyRect;
res = QueryInterface(kIWidgetIID,(void**)&widget); aRenderingContext.SetColor(GetBackgroundColor());
if (NS_OK != res)
return nsEventStatus_eIgnore;
aRenderingContext.SetColor(widget->GetBackgroundColor());
aRenderingContext.FillRect(r); aRenderingContext.FillRect(r);
r.width--; r.width--;
nsIDeviceContext* dc = GetDeviceContext(); //*** use COM_auto_ptr here nsCOMPtr<nsIDeviceContext> dc ( dont_AddRef(GetDeviceContext()) );
if ( !dc )
return nsEventStatus_eIgnore;
nsFont titleBarFont("MS Sans Serif", NS_FONT_STYLE_NORMAL, NS_FONT_VARIANT_NORMAL, nsFont titleBarFont("MS Sans Serif", NS_FONT_STYLE_NORMAL, NS_FONT_VARIANT_NORMAL,
400, NS_FONT_DECORATION_NONE, 400, NS_FONT_DECORATION_NONE,
12); 12);
@ -854,8 +790,6 @@ nsEventStatus nsToolbar::OnPaint(nsIRenderingContext& aRenderingContext,
if ( styleInfo.BackgroundImage() ) if ( styleInfo.BackgroundImage() )
PaintBackgroundImage(aRenderingContext, styleInfo.BackgroundImage(), r); PaintBackgroundImage(aRenderingContext, styleInfo.BackgroundImage(), r);
NS_RELEASE(dc);
if (mBorderType != eToolbarBorderType_none) if (mBorderType != eToolbarBorderType_none)
{ {
nsRect rect(r); nsRect rect(r);
@ -873,7 +807,6 @@ nsEventStatus nsToolbar::OnPaint(nsIRenderingContext& aRenderingContext,
aRenderingContext.DrawLine(rect.width,0,rect.width,rect.height); aRenderingContext.DrawLine(rect.width,0,rect.width,rect.height);
} }
} }
NS_RELEASE(widget);
return nsEventStatus_eIgnore; return nsEventStatus_eIgnore;
} }
@ -888,8 +821,7 @@ nsEventStatus nsToolbar::HandleEvent(nsGUIEvent *aEvent)
aEvent->widget->GetBounds(r); aEvent->widget->GetBounds(r);
r.x = 0; r.x = 0;
r.y = 0; r.y = 0;
nsIRenderingContext *drawCtx = ((nsPaintEvent*)aEvent)->renderingContext; nsCOMPtr<nsIRenderingContext> drawCtx(NS_STATIC_CAST(nsPaintEvent*, aEvent)->renderingContext);
return (OnPaint(*drawCtx,r)); return (OnPaint(*drawCtx,r));
} }
@ -990,6 +922,7 @@ NS_METHOD nsToolbar::GetPreferredConstrainedSize(PRInt32& aSuggestedWidth, PRInt
} }
#if GRIPPYS_NOT_WIDGETS
//------------------------------------------------------------------- //-------------------------------------------------------------------
NS_METHOD nsToolbar::CreateTab(nsIWidget *& aTab) NS_METHOD nsToolbar::CreateTab(nsIWidget *& aTab)
@ -1058,9 +991,11 @@ NS_METHOD nsToolbar::CreateTab(nsIWidget *& aTab)
NS_RELEASE(toolbarItem); NS_RELEASE(toolbarItem);
NS_RELEASE(toolbarItemHolder); NS_RELEASE(toolbarItemHolder);
return NS_OK; return NS_OK;
} }
#endif
// //
// PaintBackgroundImage // PaintBackgroundImage

11
widget/src/xpwidgets/nsToolbar.h
View File

@ -71,8 +71,10 @@ public:
NS_IMETHOD SetMargin(PRInt32 aMargin); NS_IMETHOD SetMargin(PRInt32 aMargin);
NS_IMETHOD SetLastItemIsRightJustified(const PRBool & aState); NS_IMETHOD SetLastItemIsRightJustified(const PRBool & aState);
NS_IMETHOD SetNextLastItemIsStretchy(const PRBool & aState); NS_IMETHOD SetNextLastItemIsStretchy(const PRBool & aState);
#if GRIPPYS_NOT_WIDGETS
NS_IMETHOD SetToolbarManager(nsIToolbarManager * aToolbarManager); NS_IMETHOD SetToolbarManager(nsIToolbarManager * aToolbarManager);
NS_IMETHOD GetToolbarManager(nsIToolbarManager *& aToolbarManager); NS_IMETHOD GetToolbarManager(nsIToolbarManager *& aToolbarManager);
#endif
NS_IMETHOD SetBorderType(nsToolbarBorderType aBorderType); NS_IMETHOD SetBorderType(nsToolbarBorderType aBorderType);
NS_IMETHOD_(nsEventStatus) OnPaint(nsIRenderingContext& aRenderingContext, NS_IMETHOD_(nsEventStatus) OnPaint(nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect); const nsRect& aDirtyRect);
@ -115,7 +117,9 @@ public:
NS_IMETHOD GetPreferredConstrainedSize(PRInt32& aSuggestedWidth, PRInt32& aSuggestedHeight, NS_IMETHOD GetPreferredConstrainedSize(PRInt32& aSuggestedWidth, PRInt32& aSuggestedHeight,
PRInt32& aWidth, PRInt32& aHeight); PRInt32& aWidth, PRInt32& aHeight);
#if GRIPPYS_NOT_WIDGETS
NS_IMETHOD CreateTab(nsIWidget *& aTab); NS_IMETHOD CreateTab(nsIWidget *& aTab);
#endif
// Override the widget creation method // Override the widget creation method
NS_IMETHOD Create(nsIWidget *aParent, NS_IMETHOD Create(nsIWidget *aParent,
@ -130,10 +134,6 @@ protected:
void GetMargins(PRInt32 &aX, PRInt32 &aY); void GetMargins(PRInt32 &aX, PRInt32 &aY);
void DoHorizontalLayout(const nsRect& aTBRect); void DoHorizontalLayout(const nsRect& aTBRect);
void DoVerticalLayout(const nsRect& aTBRect); void DoVerticalLayout(const nsRect& aTBRect);
void AddTab(const nsString& aUpURL,
const nsString& aPressedURL,
const nsString& aDisabledURL,
const nsString& aRollOverURL);
// General function for painting a background image. // General function for painting a background image.
void PaintBackgroundImage(nsIRenderingContext& drawCtx, void PaintBackgroundImage(nsIRenderingContext& drawCtx,
@ -142,7 +142,6 @@ protected:
//*** these should be smart pointers *** //*** these should be smart pointers ***
nsToolbarDataModel* mDataModel; // The data source from which everything to draw is obtained. nsToolbarDataModel* mDataModel; // The data source from which everything to draw is obtained.
nsIImageGroup* mImageGroup; // Used to make requests for toolbar images.
//*** This will all be stored in the DOM //*** This will all be stored in the DOM
ToolbarLayoutInfo ** mItems; ToolbarLayoutInfo ** mItems;
@ -161,7 +160,9 @@ protected:
PRBool mWrapItems; PRBool mWrapItems;
PRBool mDoHorizontalLayout; PRBool mDoHorizontalLayout;
#if GRIPPYS_NOT_WIDGETS
nsIToolbarManager * mToolbarMgr; nsIToolbarManager * mToolbarMgr;
#endif
}; };