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

Added extra parameter for flags for setting space manager

Browse Source 
also setting the internal area frame to use a space manager when necessary
b=33200
Added asserts in LabelHack method to catch problem in Reflow
Correctly set the avilable size to reflow available size instead of mComputedSize
This caused the content to leak out.
b=29276


git-svn-id: svn://10.0.0.236/trunk@64246 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com
2000-03-27 22:12:19 +00:00
parent e5bece7999
commit d014dde2e9
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/layout/html/forms/src/nsLabelFrame.cpp
View File

@@ -125,7 +125,7 @@ protected:
};
nsresult
NS_NewLabelFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
NS_NewLabelFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, PRUint32 aStateFlags)
{
NS_PRECONDITION(aNewFrame, "null OUT ptr");
if (nsnull == aNewFrame) {
@@ -135,6 +135,12 @@ NS_NewLabelFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
if (!it) {
return NS_ERROR_OUT_OF_MEMORY;
}
// set the state flags (if any are provided)
nsFrameState state;
it->GetFrameState( &state );
state |= aStateFlags;
it->SetFrameState( state );
*aNewFrame = it;
return NS_OK;
}
@@ -421,10 +427,15 @@ nsLabelFrame::SetInitialChildList(nsIPresContext* aPresContext,
GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&) styleDisplay);
mInline = (NS_STYLE_DISPLAY_BLOCK != styleDisplay->mDisplay);
PRUint8 flags = (mInline) ? NS_BLOCK_SHRINK_WRAP : 0;
const nsStylePosition* position;
GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&) position);
PRUint32 flags = (mInline) ? NS_BLOCK_SHRINK_WRAP : 0;
nsCOMPtr<nsIPresShell> shell;
aPresContext->GetShell(getter_AddRefs(shell));
flags |= position->IsAbsolutelyPositioned() ? NS_BLOCK_SPACE_MGR : 0;
nsIFrame* areaFrame;
NS_NewAreaFrame(shell, &areaFrame, flags);
mFrames.SetFrames(areaFrame);
@@ -462,23 +473,27 @@ void LabelHack(nsHTMLReflowState& aReflowState, char* aMessage)
{
if (aReflowState.mComputedWidth == 0) {
aReflowState.mComputedWidth = aReflowState.availableWidth;
NS_ASSERTION(0, "LabelHack: Path #1");
}
if ((aReflowState.mComputedWidth != NS_INTRINSICSIZE) &&
(aReflowState.mComputedWidth > aReflowState.availableWidth) &&
(aReflowState.availableWidth > 0)) {
// printf("BUG - %s has a computed width = %d, available width = %d \n",
// aMessage, aReflowState.mComputedWidth, aReflowState.availableWidth);
printf("BUG - %s has a computed width = %d, available width = %d \n",
aMessage, aReflowState.mComputedWidth, aReflowState.availableWidth);
aReflowState.mComputedWidth = aReflowState.availableWidth;
NS_ASSERTION(0, "LabelHack: Path #2");
}
if (aReflowState.mComputedHeight == 0) {
aReflowState.mComputedHeight = aReflowState.availableHeight;
NS_ASSERTION(0, "LabelHack: Path #3");
}
if ((aReflowState.mComputedHeight != NS_INTRINSICSIZE) &&
(aReflowState.mComputedHeight > aReflowState.availableHeight) &&
(aReflowState.availableHeight > 0)) {
// printf("BUG - %s has a computed height = %d, available height = %d \n",
// aMessage, aReflowState.mComputedHeight, aReflowState.availableHeight);
printf("BUG - %s has a computed height = %d, available height = %d \n",
aMessage, aReflowState.mComputedHeight, aReflowState.availableHeight);
aReflowState.mComputedHeight = aReflowState.availableHeight;
NS_ASSERTION(0, "LabelHack: Path #4");
}
}
@@ -577,7 +592,7 @@ nsLabelFrame::Reflow(nsIPresContext* aPresContext,
}
}
nsSize availSize(aReflowState.mComputedWidth, aReflowState.mComputedHeight);
nsSize availSize(aReflowState.availableWidth, aReflowState.availableHeight);
// get border and padding
const nsStyleSpacing* spacing =