зеркало из https://github.com/mozilla/pjs.git
Bug 533714, use a size of (0,0) for placeholders, prevents popups from taking up space when not open, r=bz
This commit is contained in:
Родитель
33eae30cad
Коммит
54c462e32b
|
@ -80,6 +80,30 @@ nsPlaceholderFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
|
|||
return result;
|
||||
}
|
||||
|
||||
/* virtual */ nsSize
|
||||
nsPlaceholderFrame::GetMinSize(nsBoxLayoutState& aBoxLayoutState)
|
||||
{
|
||||
nsSize size(0, 0);
|
||||
DISPLAY_MIN_SIZE(this, size);
|
||||
return size;
|
||||
}
|
||||
|
||||
/* virtual */ nsSize
|
||||
nsPlaceholderFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState)
|
||||
{
|
||||
nsSize size(0, 0);
|
||||
DISPLAY_PREF_SIZE(this, size);
|
||||
return size;
|
||||
}
|
||||
|
||||
/* virtual */ nsSize
|
||||
nsPlaceholderFrame::GetMaxSize(nsBoxLayoutState& aBoxLayoutState)
|
||||
{
|
||||
nsSize size(NS_INTRINSICSIZE, NS_INTRINSICSIZE);
|
||||
DISPLAY_MAX_SIZE(this, size);
|
||||
return size;
|
||||
}
|
||||
|
||||
/* virtual */ void
|
||||
nsPlaceholderFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
|
||||
nsIFrame::InlineMinWidthData *aData)
|
||||
|
|
|
@ -128,6 +128,9 @@ public:
|
|||
InlineMinWidthData *aData);
|
||||
virtual void AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
|
||||
InlinePrefWidthData *aData);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
<window align="start" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
<label value="One"/>
|
||||
<label value="Two"/>
|
||||
</window>
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
<window align="start" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
<label value="One"/>
|
||||
<popup height="40"/>
|
||||
<label value="Two"/>
|
||||
</window>
|
|
@ -1,2 +1,3 @@
|
|||
== textbox-multiline-noresize.xul textbox-multiline-ref.xul
|
||||
!= textbox-multiline-resize.xul textbox-multiline-ref.xul
|
||||
== popup-explicit-size.xul popup-explicit-size-ref.xul
|
||||
|
|
Загрузка…
Ссылка в новой задаче