X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Fthemerc.xsd;h=a122c3a44917a14bda2fded8948d50402b47a083;hb=48f237203b8766e7d13af3f6e2d5deecc14b6651;hp=7b9573d93ce85e39528ca38b30411696f6c0b906;hpb=ec304c9e433e4b1cedf924ca64d783f05db7d42d;p=chaz%2Fopenbox

diff --git a/data/themerc.xsd b/data/themerc.xsd
index 7b9573d9..a122c3a4 100755
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -22,11 +22,6 @@
     </xs:annotation>
   </xs:element>
 
-  <xs:complexType name="padding">
-    <xs:attribute name="horizontal" type="xs:integer"/>
-    <xs:attribute name="vertical" type="xs:integer"/>
-  </xs:complexType>
-
   <xs:complexType name="color">
     <xs:attribute name="r" type="xs:integer"/>
     <xs:attribute name="g" type="xs:integer"/>
@@ -119,7 +114,9 @@
       <xs:element name="pressed" type="obt:buttonarea" minOccurs="0"/>
       <xs:element name="hover" type="obt:buttonarea" minOccurs="0"/>
       <xs:element name="disabled" type="obt:buttonarea" minOccurs="0"/>
-      <xs:element name="toggled" type="obt:buttonarea" minOccurs="0"/>
+      <xs:element name="toggled-unpressed" type="obt:buttonarea" minOccurs="0"/>
+      <xs:element name="toggled-pressed" type="obt:buttonarea" minOccurs="0"/>
+      <xs:element name="toggled-hover" type="obt:buttonarea" minOccurs="0"/>
     </xs:all>
   </xs:complexType>
 
@@ -136,7 +133,7 @@
 
   <xs:complexType name="allwindows">
     <xs:all>
-      <xs:element name="clientpadding" type="obt:padding" minOccurs="0"/>
+      <xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
       <xs:element name="justify" type="obt:justify" minOccurs="0"/>
       <xs:element name="border" type="obt:border" minOccurs="0"/>
       <xs:element name="inactive" type="obt:window" minOccurs="0"/>
@@ -152,7 +149,7 @@
 
   <xs:complexType name="themeDimensions">
     <xs:all>
-      <xs:element name="padding" type="obt:padding" minOccurs="0"/>
+      <xs:element name="padding" type="obt:point" minOccurs="0"/>
       <xs:element name="handle" type="xs:integer" minOccurs="0"/>
     </xs:all>
   </xs:complexType>