зеркало из https://github.com/mozilla/gecko-dev.git
Bug 277355. Make columns get the right containing block width and height. r+sr=bzbarsky
This commit is contained in:
Родитель
9ad4cbaa75
Коммит
429650eef3
|
@ -432,7 +432,8 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
|
||||||
}
|
}
|
||||||
|
|
||||||
nsHTMLReflowState kidReflowState(GetPresContext(), aReflowState, child,
|
nsHTMLReflowState kidReflowState(GetPresContext(), aReflowState, child,
|
||||||
availSize, tmpReason);
|
availSize, availSize.width,
|
||||||
|
aReflowState.mComputedHeight, tmpReason);
|
||||||
|
|
||||||
#ifdef DEBUG_roc
|
#ifdef DEBUG_roc
|
||||||
printf("*** Reflowing child #%d %p: reason = %d, availHeight=%d\n",
|
printf("*** Reflowing child #%d %p: reason = %d, availHeight=%d\n",
|
||||||
|
|
|
@ -153,6 +153,11 @@
|
||||||
/* the column boxes inside a column-flowed block */
|
/* the column boxes inside a column-flowed block */
|
||||||
/* make unicode-bidi inherit, otherwise it has no effect on column boxes */
|
/* make unicode-bidi inherit, otherwise it has no effect on column boxes */
|
||||||
unicode-bidi: inherit;
|
unicode-bidi: inherit;
|
||||||
|
/* inherit the outer frame's display, otherwise we turn into an inline */
|
||||||
|
display: inherit !important;
|
||||||
|
/* Carry through our parent's height so that %-height children get
|
||||||
|
their heights set */
|
||||||
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
*|*::-moz-page, *|*::-moz-page-sequence {
|
*|*::-moz-page, *|*::-moz-page-sequence {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче