Changeset 13688 in webkit

Timestamp:

Apr 4, 2006 3:23:01 PM (18 years ago)

Author:

adele

Message:

LayoutTests:

• Test for:

​http://bugzilla.opendarwin.org/show_bug.cgi?id=8092
REGRESSION (NativeTextField): table contents misaligned in Netflix queue

​http://bugzilla.opendarwin.org/show_bug.cgi?id=8141
REGRESSION: Native text field fails to wrap inside table

​http://bugzilla.opendarwin.org/show_bug.cgi?id=8072
REGRESSION: text fields at connect.apple.com spill out of the containing box

• fast/forms/input-table-expected.checksum: Added.
• fast/forms/input-table-expected.png: Added.
• fast/forms/input-table-expected.txt: Added.
• fast/forms/input-table.html: Added.

WebCore:

Reviewed by Hyatt.

• Fix for: ​http://bugzilla.opendarwin.org/show_bug.cgi?id=8092 REGRESSION (NativeTextField): table contents misaligned in Netflix queue

​http://bugzilla.opendarwin.org/show_bug.cgi?id=8141
REGRESSION: Native text field fails to wrap inside table

​http://bugzilla.opendarwin.org/show_bug.cgi?id=8072
REGRESSION: text fields at connect.apple.com spill out of the containing box

Test: fast/forms/input-table.html

Rewrote calcMinMaxWidth for text fields so it considers width,
min-width, and max-width settings as well as the size attribute.

• rendering/RenderTextField.cpp: (WebCore::RenderTextField::calcMinMaxWidth):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-table-expected.checksum (added)
• LayoutTests/fast/forms/input-table-expected.png (added)
• LayoutTests/fast/forms/input-table-expected.txt (added)
• LayoutTests/fast/forms/input-table.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTextField.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-04-04  Adele Peterson  <adele@apple.com>
+
+         - Test for:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8092
+        REGRESSION (NativeTextField): table contents misaligned in Netflix queue
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8141
+        REGRESSION: Native text field fails to wrap inside table
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8072
+        REGRESSION: text fields at connect.apple.com spill out of the containing box
+
+        * fast/forms/input-table-expected.checksum: Added.
+        * fast/forms/input-table-expected.png: Added.
+        * fast/forms/input-table-expected.txt: Added.
+        * fast/forms/input-table.html: Added.
+
 2006-04-04  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-04-04  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Hyatt.
+
+        - Fix for:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8092
+        REGRESSION (NativeTextField): table contents misaligned in Netflix queue
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8141
+        REGRESSION: Native text field fails to wrap inside table
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8072
+        REGRESSION: text fields at connect.apple.com spill out of the containing box
+
+        Test: fast/forms/input-table.html
+
+        Rewrote calcMinMaxWidth for text fields so it considers width, 
+        min-width, and max-width settings as well as the size attribute.
+
+        * rendering/RenderTextField.cpp: (WebCore::RenderTextField::calcMinMaxWidth):
+
 2006-04-04  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/rendering/RenderTextField.cpp

@@ -216 +216 @@
 void RenderTextField::calcMinMaxWidth()
 {
-    // Figure out how big a text field needs to be for a given number of characters
-    // (using "0" as the nominal character).
-    int size = static_cast<HTMLInputElement*>(element())->size();
-    if (size <= 0)
-        size = 20;
-    
-    QChar ch[1];
-    ch[0] = '0';
-    m_minWidth = m_maxWidth = (int)ceilf(style()->font().floatWidth(ch, 1, 0, 1, 0, 0) * size) + paddingLeft() + paddingRight() + 
-                borderLeft() + borderRight() + m_div->renderer()->paddingLeft() + m_div->renderer()->paddingRight();
-    setMinMaxKnown();
+    m_minWidth = 0;
+    m_maxWidth = 0;
+
+    if (style()->width().isFixed() && style()->width().value() > 0)
+        m_minWidth = m_maxWidth = calcContentBoxWidth(style()->width().value());
+    else {
+        // Figure out how big a text field needs to be for a given number of characters
+        // (using "0" as the nominal character).
+        int size = static_cast<HTMLInputElement*>(element())->size();
+        if (size <= 0)
+            size = 20;
+
+        QChar ch[1];
+        ch[0] = '0';
+        int sizeWidth = (int)ceilf(style()->font().floatWidth(ch, 1, 0, 1, 0, 0) * size);
+        m_maxWidth = sizeWidth;
+    }
+    
+    if (style()->minWidth().isFixed() && style()->minWidth().value() > 0) {
+        m_maxWidth = max(m_maxWidth, calcContentBoxWidth(style()->minWidth().value()));
+        m_minWidth = max(m_minWidth, calcContentBoxWidth(style()->minWidth().value()));
+    } else
+        m_minWidth = m_maxWidth;
+    
+    if (style()->maxWidth().isFixed() && style()->maxWidth().value() != undefinedLength) {
+        m_maxWidth = min(m_maxWidth, calcContentBoxWidth(style()->maxWidth().value()));
+        m_minWidth = min(m_minWidth, calcContentBoxWidth(style()->maxWidth().value()));
+    }
+
+    int toAdd = paddingLeft() + paddingRight() + borderLeft() + borderRight() + m_div->renderer()->paddingLeft() + m_div->renderer()->paddingRight();
+    m_minWidth += toAdd;
+    m_maxWidth += toAdd;
+
+    setMinMaxKnown();    
 }