[webkit-changes] cvs commit: WebCore/khtml/rendering render_form.cpp render_replaced.cpp

[Beth]

bdakin      05/11/11 09:44:28

  Modified:    .        ChangeLog
               khtml/rendering render_form.cpp render_replaced.cpp
  Log:
  Bug #:
  
  Revision  Changes    Path
  1.355     +20 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.354
  retrieving revision 1.355
  diff -u -r1.354 -r1.355
  --- ChangeLog	11 Nov 2005 03:16:18 -0000	1.354
  +++ ChangeLog	11 Nov 2005 17:44:26 -0000	1.355
  @@ -1,3 +1,23 @@
  +2005-11-11  Beth Dakin  <bdakin at apple.com>
  +
  +        Reviewed by Hyatt.
  +
  +	Fix for <rdar://problem/3952698> Function buttons do not display 
  +	properly with Telia Webmail (3488). 
  +
  +	Replaced elements with a percentage width used to be given a minimum
  +	width of 0. This caused buttons etc with width:100% to overlap when
  +	they shouldn't. Textareas and text boxes are still given a minimum
  +	width of 0 because they need slightly different behavior to match 
  +	WinIE. I filed <rdar://problem/4339518> to track this remaining problem.
  +
  +        * khtml/rendering/render_form.cpp:
  +        (RenderLineEdit::calcMinMaxWidth): Still give text fields a m_minWidth of 0.
  +        (RenderTextArea::calcMinMaxWidth): And textareas.
  +        * khtml/rendering/render_replaced.cpp:
  +        (RenderReplaced::calcMinMaxWidth): Remove the check for width().isPercent()
  +					when making m_minWidth 0.
  +
   2005-11-10  Adele Peterson  <adele at apple.com>
   
           Reviewed by Maciej.
  
  
  
  1.131     +14 -0     WebCore/khtml/rendering/render_form.cpp
  
  Index: render_form.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- render_form.cpp	11 Nov 2005 03:16:20 -0000	1.130
  +++ render_form.cpp	11 Nov 2005 17:44:27 -0000	1.131
  @@ -422,6 +422,13 @@
       setIntrinsicHeight( s.height() );
   
       RenderFormElement::calcMinMaxWidth();
  +    
  +    // FIXME: m_minWidth should not really be set to 0. If textfields 
  +    // have value text in them to begin with, then to match WinIE the
  +    // field should only be as wide as the text. Setting m_minWidth to 
  +    // 0 also makes textfields with width:100% overlap. 
  +    if (style()->width().isPercent())
  +        m_minWidth = 0;
   }
   
   void RenderLineEdit::setStyle(RenderStyle *s)
  @@ -1370,6 +1377,13 @@
       setIntrinsicHeight( size.height() );
   
       RenderFormElement::calcMinMaxWidth();
  +    
  +    // FIXME: m_minWidth should not really be set to 0. If textareas 
  +    // have value text in them to begin with, then to match WinIE the
  +    // textarea should only be as wide as the text. Setting m_minWidth
  +    // to 0 also makes textareas with width:100% overlap. 
  +    if (style()->width().isPercent())
  +        m_minWidth = 0;
   }
   
   void RenderTextArea::setStyle(RenderStyle *s)
  
  
  
  1.93      +2 -3      WebCore/khtml/rendering/render_replaced.cpp
  
  Index: render_replaced.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_replaced.cpp,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- render_replaced.cpp	25 Oct 2005 00:07:46 -0000	1.92
  +++ render_replaced.cpp	11 Nov 2005 17:44:27 -0000	1.93
  @@ -100,11 +100,10 @@
   #endif
   
       int width = calcReplacedWidth() + paddingLeft() + paddingRight() + borderLeft() + borderRight();
  -    if (style()->width().isPercent() || (style()->width().isAuto() && style()->height().isPercent())) {
  +    if (style()->width().isAuto() && style()->height().isPercent()) {
           m_minWidth = 0;
           m_maxWidth = width;
  -    }
  -    else
  +    } else
           m_minWidth = m_maxWidth = width;
   
       setMinMaxKnown();