Implement horizontal and vertical border-spacing

[David Hyatt]

Index: khtml/css/cssparser.cpp
===================================================================
RCS file: /local/home/cvs/Labyrinth/WebCore/khtml/css/cssparser.cpp,v
retrieving revision 1.43
diff -u -p -r1.43 khtml/css/cssparser.cpp
--- khtml/css/cssparser.cpp	2003/10/17 22:32:13	1.43
+++ khtml/css/cssparser.cpp	2003/10/18 21:27:55
@@ -689,8 +689,8 @@ bool CSSParser::parseValue( int propId, 
 	break;
 
     case CSS_PROP_BORDER_SPACING: {
-        const int properties[2] = { CSS_PROP__KHTML_HORIZONTAL_BORDER_SPACING,
-                                    CSS_PROP__KHTML_VERTICAL_BORDER_SPACING };
+        const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
+                                    CSS_PROP__KHTML_BORDER_VERTICAL_SPACING };
         int num = valueList->numValues;
         if (num == 1) {
             if (!parseValue(properties[0], important)) return false;
@@ -705,8 +705,8 @@ bool CSSParser::parseValue( int propId, 
         }
         return false;
     }
-    case CSS_PROP__KHTML_HORIZONTAL_BORDER_SPACING:
-    case CSS_PROP__KHTML_VERTICAL_BORDER_SPACING:
+    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
+    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
         valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint));
         break;
     case CSS_PROP_SCROLLBAR_FACE_COLOR:         // IE5.5

Index: khtml/css/cssproperties.in
===================================================================
RCS file: /local/home/cvs/Labyrinth/WebCore/khtml/css/cssproperties.in,v
retrieving revision 1.7
diff -u -p -r1.7 khtml/css/cssproperties.in
--- khtml/css/cssproperties.in	2003/10/17 22:32:13	1.7
+++ khtml/css/cssproperties.in	2003/10/18 21:27:56
@@ -24,8 +24,8 @@ background-position-y
 
 border-collapse
 border-spacing
--khtml-horizontal-border-spacing
--khtml-vertical-border-spacing
+-khtml-border-horizontal-spacing
+-khtml-border-vertical-spacing
 border-top-color
 border-right-color
 border-bottom-color
Index: khtml/css/cssstyleselector.cpp
===================================================================
RCS file: /local/home/cvs/Labyrinth/WebCore/khtml/css/cssstyleselector.cpp,v
retrieving revision 1.99
diff -u -p -r1.99 khtml/css/cssstyleselector.cpp
--- khtml/css/cssstyleselector.cpp	2003/10/18 20:48:27	1.99
+++ khtml/css/cssstyleselector.cpp	2003/10/18 21:28:00
@@ -2172,13 +2172,13 @@ void CSSStyleSelector::applyRule( int id
         style->setVerticalBorderSpacing(parentStyle->verticalBorderSpacing());
         break;
     }
-    case CSS_PROP__KHTML_HORIZONTAL_BORDER_SPACING: {
+    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: {
         if (!primitiveValue) break;
         short spacing =  primitiveValue->computeLength(style, paintDeviceMetrics);
         style->setHorizontalBorderSpacing(spacing);
         break;
     }
-    case CSS_PROP__KHTML_VERTICAL_BORDER_SPACING: {
+    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: {
         if (!primitiveValue) break;
         short spacing =  primitiveValue->computeLength(style, paintDeviceMetrics);
         style->setVerticalBorderSpacing(spacing);
-------------- next part --------------


dave

On Oct 18, 2003, at 2:20 PM, David Hyatt wrote:

> I plan to propose them for inclusion in CSS3 (probably under the names 
> border-horizontal-spacing and border-vertical-spacing) and then 
> propose that border-spacing become a shorthand for the two properties.
>
> I will adjust the names to put "border" before "horizontal" and 
> "vertical".
>
> dave
>
> On Oct 18, 2003, at 2:15 PM, Dirk Mueller wrote:
>
>> On Saturday 18 October 2003 09:00, David Hyatt wrote:
>>
>>> +-khtml-horizontal-border-spacing
>>> +-khtml-vertical-border-spacing
>>
>> do you need these two extra properties anywhere or did you just add 
>> them to
>> make the patch easier?
>>
>>
>> -- 
>>> Looking for a KDE-related EMail-Alias ? Get one at kdemail.net for 
>>> FREE! <
>> _______________________________________________
>> Khtml-devel at mail.kde.org
>> http://mail.kde.org/mailman/listinfo/khtml-devel
>
> _______________________________________________
> Khtml-devel at mail.kde.org
> http://mail.kde.org/mailman/listinfo/khtml-devel