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

fixes to get collapsed grippies to be the same size as the toolbar that was collapsed. It was my error that I caught earlier, but forgot to go back to it. Chris' code did the right thing.

Browse Source
This commit is contained in:
pinkerton%netscape.com 1999-05-27 22:39:10 +00:00
parent 7a941a0baa
commit d4fed0341a
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layout/xul/base/src/nsToolboxFrame.cpp
View File

@ -303,11 +303,8 @@ nsToolboxFrame :: Reflow(nsIPresContext& aPresContext,
grippyHeight = collapsedGrippyHeight;
}
PRInt32 oldPos = 0;
if ( oldGrippies.Count() )
oldPos = oldGrippies.IndexOf(childContent);
if ( oldPos >= 0 ) { // Inherit the old size...
TabInfo* oldGrippy = NS_STATIC_CAST(TabInfo*, oldGrippies[oldPos]);
TabInfo* oldGrippy = FindGrippyForToolbar ( oldGrippies, childContent );
if ( oldGrippy ) { // Inherit the old size...
if ( isHorz ) { // If laying out children horizontally...
if ( oldGrippy->mCollapsed) // Did it used to be collapsed?
grippyHeight = oldGrippy->mBoundingRect.height; // Copy old width
@ -379,7 +376,7 @@ nsToolboxFrame :: Reflow(nsIPresContext& aPresContext,
grippyRect.width = grippyWidth;
}
TabInfo *grippyInfo = FindGrippyForToolbar(childContent);
TabInfo *grippyInfo = FindGrippyForToolbar(mGrippies, childContent);
NS_ASSERTION(grippyInfo != 0, "Grippy Info Struct dissapeared!");
NS_ASSERTION(grippyInfo->mCollapsed == 0, "Collapsed toolbar has frame!");
@ -413,11 +410,19 @@ nsToolboxFrame :: Reflow(nsIPresContext& aPresContext,
} // Reflow
//
// FindGrippyForToolbar
//
// Utility routine to scan through the grippy list looking for one in the list
// associated with the given content object (which is the toolbar's content object).
//
// Will return nsnull if it cannot find the toolbar.
//
nsToolboxFrame::TabInfo*
nsToolboxFrame :: FindGrippyForToolbar ( const nsIContent* inContent ) const
nsToolboxFrame :: FindGrippyForToolbar ( nsVoidArray & inList, const nsIContent* inContent ) const
{
for ( PRInt32 i = 0; i < mGrippies.Count(); ++i ) {
TabInfo* currGrippy = NS_STATIC_CAST(TabInfo*, mGrippies[i]);
for ( PRInt32 i = 0; i < inList.Count(); ++i ) {
TabInfo* currGrippy = NS_STATIC_CAST(TabInfo*, inList[i]);
if ( currGrippy->mToolbar == inContent )
return currGrippy;
}

4
layout/xul/base/src/nsToolboxFrame.h
View File

@ -112,17 +112,15 @@ protected:
void DrawGrippy ( nsIPresContext& aPresContext, nsIRenderingContext & aContext,
const nsRect & aBoundingRect, PRBool aDrawHilighted ) const ;
void CollapseToolbar ( TabInfo & inTab ) ;
void ExpandToolbar ( TabInfo & inTab ) ;
void ConvertToLocalPoint ( nsPoint & ioPoint ) ;
void OnMouseMove ( nsPoint & aMouseLoc ) ;
void OnMouseExit ( ) ;
void OnMouseLeftClick ( nsPoint & aMouseLoc ) ;
// utility routines
TabInfo* FindGrippyForToolbar ( const nsIContent* inContent ) const ;
TabInfo* FindGrippyForToolbar ( nsVoidArray & inList, const nsIContent* inContent ) const ;
void ClearGrippyList ( nsVoidArray & inList ) ;
// style context for the normal state and rollover state of grippies