Re: margin-bottom counted twice

On Fri, Aug 26, 2011 at 04:48:46PM -0300, Jorge Arellano Cid wrote:
> On Fri, Aug 26, 2011 at 09:43:39PM +0200, Johannes Hofmann wrote:
> > On Fri, Aug 26, 2011 at 04:21:04PM +0000, corvid wrote:
> > > Johannes wrote:
> > > > I'm not 100% sure about removing the "if" in Textblock::wordWrap(),
> > > > but why shouldn't a widget's top margin count in the first line of a
> > > > paragraph?
> > > 
> > > My first thought was that maybe it has something to do with cases like
> > > 
> > > <div style="margin-top: 100px">
> > >  <div style="margin-top: 100px">
> > >   <img src="http://www.dillo.org/wearlab.png" style="margin-top: 100px">
> > > </div>
> > > </div>
> > > 
> > > where I was thinking those were all supposed to collapse. I haven't looked
> > > into the spec at all yet, but we get a total of 300px on dillo, and firefox
> > > has the divs collapse and the img margin is separate (maybe a block/inline
> > > distinction?).
> > 
> > seems so. changing it to
> > <img src="http://www.dillo.org/wearlab.png" style="display: block; margin-top: 100px">
> > causes firefox to also collapse the img margin.
> > I have margin collapsing also on my list.
> 
>   And on the textblock side, it seems to render just as before with
> the patch.
> 
>   Johannes, please decide on whether to apply it before the release.
> I'll try to pack RC2 this Monday.

Committed, including some margin collapsing.