summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/themerc.xsd6
-rw-r--r--tools/themetoxml/themetoxml.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/data/themerc.xsd b/data/themerc.xsd
index 40b036a5..3a636b5d 100644
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -147,20 +147,20 @@
<xs:complexType name="windowDimensions">
<xs:all>
- <xs:element name="borderwidth" type="xs:integer" minOccurs="0"/>
+ <xs:element name="border" type="xs:integer" minOccurs="0"/>
<xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
</xs:all>
</xs:complexType>
<xs:complexType name="menuDimensions">
<xs:all>
- <xs:element name="borderwidth" type="xs:integer" minOccurs="0"/>
+ <xs:element name="border" type="xs:integer" minOccurs="0"/>
</xs:all>
</xs:complexType>
<xs:complexType name="osdDimensions">
<xs:all>
- <xs:element name="borderwidth" type="xs:integer" minOccurs="0"/>
+ <xs:element name="border" type="xs:integer" minOccurs="0"/>
</xs:all>
</xs:complexType>
diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index 5c7ac8af..b53599b2 100644
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -374,6 +374,8 @@ int main(int argc, char **argv)
COLOR3("window", "inactive", "titleseparator", i, j, k, 255);
if (read_color(db, "menu.border.color", &i, &j, &k))
COLOR2("menu", "border", i, j, k, 255);
+ if (read_color(db, "osd.border.color", &i, &j, &k))
+ COLOR2("osd", "border", i, j, k, 255);
if (read_int(db, "window.client.padding.width", &i)) {
ATTR3("dimensions", "window", "clientpadding", "x", NUM(i));