Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calc button size stuff at startup not at draw time for layout.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@12151 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pinkerton%netscape.com
1998-10-07 04:10:21 +00:00
parent 1c5a533798
commit 58df60018c
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/cmd/macfe/gui/CRDFToolbarItem.cp
View File

@@ -79,6 +79,9 @@ CRDFPushButton :: CRDFPushButton ( HT_Resource inNode )
AttachPaneEnabler();
AssignCommand();
// get ready to draw by caching all the graphic and title rects.
PrepareDrawButton();
}
@@ -369,7 +372,25 @@ CRDFPushButton::NaturalSize( SDimension16 inAvailable ) const
*/
{
SDimension16 desiredSpace;
desiredSpace.width = 50; desiredSpace.height = 50; //¥¥¥ for now
bool iconOnSide = true;
char* value = NULL;
PRBool success = HT_GetTemplateData ( HT_TopNode(HT_GetView(HTNode())), gNavCenter->toolbarBitmapPosition, HT_COLUMN_STRING, &value );
if ( success && value ) {
if ( strcmp(value, "top") == 0 )
iconOnSide = false;
}
if ( iconOnSide ) {
desiredSpace.width = (mCachedTitleFrame.right - mCachedTitleFrame.left) +
(mCachedGraphicFrame.right - mCachedGraphicFrame.left) + 15;
desiredSpace.height = min ( max(mCachedGraphicFrame.bottom - mCachedGraphicFrame.top,
mCachedTitleFrame.bottom - mCachedTitleFrame.top), 24);
}
else {
desiredSpace.width = 50;
desiredSpace.height = 50; //¥¥¥ for now
}
return desiredSpace;
}
@@ -798,7 +819,7 @@ CRDFSeparator :: DrawSelf ( )
Rect localRect;
CalcLocalFrameRect ( localRect );
::FrameRect ( &localRect );
::PaintRect ( &localRect );
}
@@ -812,7 +833,8 @@ SDimension16
CRDFSeparator :: NaturalSize( SDimension16 inAvailable ) const
{
SDimension16 desiredSpace;
desiredSpace.width = 15; desiredSpace.height = 50; //¥¥¥ for now
desiredSpace.width = 5;
desiredSpace.height = 24;
return desiredSpace;
@@ -871,7 +893,7 @@ SDimension16
CRDFURLBar::NaturalSize( SDimension16 inAvailable ) const
{
SDimension16 desiredSpace;
desiredSpace.width = 50; desiredSpace.height = 25; //¥¥¥ is this enough?
desiredSpace.width = 100; desiredSpace.height = 50; //¥¥¥ is this enough?
return desiredSpace;