120734 - outliner cell text dimensions wrong

Status: RESOLVED FIXED

(Core :: XUL, defect, P3)

Description

[[e-mail]]

Using Build ID: 2002011703
When using border or padding on outlinerchildren:-moz-outliner-cell-text
then the background dimensions are calculated incorrectly, although the text is
painted in the correct location. This means that the border and/or background of
the -moz-outliner-cell-text is drawn incorrectly.

Note that behaviour with older builds is that text background consists of the
remainder of the cell after the indent, twisty and image are accounted for.

Comment 1

[[e-mail]]

Attachment: Screenshot

Comment 2

[Jan Varga [:janv]]

Attachment: patch

Comment 3

[Jan Varga [:janv]]

Comment on attachment 65607 [details] [diff] [review]
patch

This needs work, I'll send a new patch later.

Comment 4

[Jan Varga [:janv]]

Attachment: new patch

Comment 5

[Jan Varga [:janv]]

Comment on attachment 65827 [details] [diff] [review]
new patch

it still has some issues

Comment 6

[[e-mail]]

Bug 80837 probably needs this to be fixed.

Comment 7

[[e-mail]]

Attachment: Proposed patch

This works for me. I allow for border/padding before calculating the text size,
but add it back when I'm actually painting the background, so that the border
gets drawn in the right place.

Comment 8

[Jan Varga [:janv]]

Comment on attachment 114338 [details] [diff] [review]
Proposed patch

>+  // Adjust the rect for its border and padding.
>+  nsStyleBorderPadding bPad;
>+  textContext->GetBorderPaddingFor(bPad);
>+  bPad.GetBorderPadding(textMargin);
>+  textRect.Deflate(textMargin);

does this differ from AdjustForBorderPadding(textContext, textRect) ?

Comment 9

[[e-mail]]

>> I allow for border/padding before calculating the text size, but add it back
> does this differ from AdjustForBorderPadding(textContext, textRect) ?
Only in that I need the value so that I can add it back...

Comment 10

[[e-mail]]

*** Bug 170387 has been marked as a duplicate of this bug. ***

Comment 11

[Jan Varga [:janv]]

Attachment: basically the same as above

I cleaned up it a bit.
Neil, could you try this one and possibly r= ?

Comment 12

[[e-mail]]

Comment on attachment 115385 [details] [diff] [review]
basically the same as above

Can't you use AdjustForBorderPadding here?
Once you've done that you might as well inline it...

>@@ -2045,11 +2042,9 @@
> nsRect nsTreeBodyFrame::GetInnerBox()
> {
>   nsRect r(0,0,mRect.width, mRect.height);
>-  nsMargin m(0,0,0,0);
>-  nsStyleBorderPadding  bPad;
>-  mStyleContext->GetBorderPaddingFor(bPad);
>-  bPad.GetBorderPadding(m);
>-  r.Deflate(m);
>+  nsMargin bp(0,0,0,0);
>+  GetBorderPadding(mStyleContext, bp);
>+  r.Deflate(bp);
>   return r;
> }
>

Comment 13

[Jan Varga [:janv]]

Attachment: new patch

good catch Neil

Comment 14

[[e-mail]]

Comment on attachment 115488 [details] [diff] [review]
new patch

I suppose that'll do...

Comment 15

[Jan Varga [:janv]]

Attachment: another try

Comment 16

[[e-mail]]

Comment on attachment 115489 [details] [diff] [review]
another try

I actually like this one!

Comment 17

[jag (Peter Annema)]

Comment on attachment 115489 [details] [diff] [review]
another try

>Index: nsTreeBodyFrame.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp,v
>retrieving revision 1.156
>diff -u -r1.156 nsTreeBodyFrame.cpp
>--- nsTreeBodyFrame.cpp	23 Feb 2003 02:47:56 -0000	1.156
>+++ nsTreeBodyFrame.cpp	25 Feb 2003 13:02:03 -0000
>@@ -374,6 +374,24 @@
>   return nsnull;
> }
> 
>+static void
>+GetBorderPadding(nsStyleContext* aContext, nsMargin& aMargin)
>+{
>+  nsStyleBorderPadding  borderPaddingStyle;
>+  aContext->GetBorderPaddingFor(borderPaddingStyle);
>+  borderPaddingStyle.GetBorderPadding(aMargin);
>+}
>+
>+static void
>+AdjustForBorderPadding(nsStyleContext* aContext, nsRect& aRect)
>+{
>+  nsStyleBorderPadding  borderPaddingStyle;
>+  aContext->GetBorderPaddingFor(borderPaddingStyle);
>+  nsMargin borderPadding(0,0,0,0);
>+  borderPaddingStyle.GetBorderPadding(borderPadding);
>+  aRect.Deflate(borderPadding);
>+}

Why not:

static void
AdjustForBorderPadding(nsStyleContext* aContext, nsRect& aRect)
{
  nsMargin borderPadding(0, 0, 0, 0);
  GetBorderPadding(aContext, borderPadding);
  aRect.Deflate(borderPadding);
}

>@@ -2042,15 +2039,10 @@

>+void nsTreeBodyFrame::CalcInnerBox()
> {
>+  mInnerBox.SetRect(0,0,mRect.width, mRect.height);

Space after comma.

Comment 18

[Jan Varga [:janv]]

ok, I'll do that

Comment 19

[Jan Varga [:janv]]

checked in