nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

point and padding became redundant.. do remove padding type from xsd and use point type. also fix bug in theme parser where it was looking for wrong one.

Browse source
This commit is contained in:
Dana Jansens 2007-03-05 16:23:13 +00:00
parent 88204502a8
commit 45087efbcd
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/themerc.xsd
View file

@ -22,11 +22,6 @@
</xs:annotation> </xs:annotation>
</xs:element> </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:complexType name="color">
<xs:attribute name="r" type="xs:integer"/> <xs:attribute name="r" type="xs:integer"/>
<xs:attribute name="g" type="xs:integer"/> <xs:attribute name="g" type="xs:integer"/>
@ -136,7 +131,7 @@
<xs:complexType name="allwindows"> <xs:complexType name="allwindows">
<xs:all> <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="justify" type="obt:justify" minOccurs="0"/>
<xs:element name="border" type="obt:border" minOccurs="0"/> <xs:element name="border" type="obt:border" minOccurs="0"/>
<xs:element name="inactive" type="obt:window" minOccurs="0"/> <xs:element name="inactive" type="obt:window" minOccurs="0"/>
@ -152,7 +147,7 @@
<xs:complexType name="themeDimensions"> <xs:complexType name="themeDimensions">
<xs:all> <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:element name="handle" type="xs:integer" minOccurs="0"/>
</xs:all> </xs:all>
</xs:complexType> </xs:complexType>

4
render/theme.c
View file

@ -1307,8 +1307,8 @@ static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[],
{ {
if ((n = find_node(n, names))) { if ((n = find_node(n, names))) {
gint a, b; gint a, b;
if (parse_attr_int("horizontal", n, &a) && if (parse_attr_int("x", n, &a) &&
parse_attr_int("vertical", n, &b) && parse_attr_int("y", n, &b) &&
a >= lowx && a <= upx && b >= lowy && b <= upy) a >= lowx && a <= upx && b >= lowy && b <= upy)
{ {
*x = a; *y = b; *x = a; *y = b;

8
tools/themetoxml/themetoxml.c
View file

@ -321,8 +321,8 @@ int main(int argc, char **argv)
CONT2("dimensions", "handle", NUM(i)); CONT2("dimensions", "handle", NUM(i));
if (read_int(db, "padding.width", &i)) { if (read_int(db, "padding.width", &i)) {
ATTR2("dimensions", "padding", "horizontal", NUM(i)); ATTR2("dimensions", "padding", "x", NUM(i));
ATTR2("dimensions", "padding", "vertical", NUM(i)); ATTR2("dimensions", "padding", "y", NUM(i));
} }
if (read_int(db, "borderWidth", &i)) { if (read_int(db, "borderWidth", &i)) {
@ -339,8 +339,8 @@ int main(int argc, char **argv)
} }
if (read_int(db, "window.client.padding.width", &i)) { if (read_int(db, "window.client.padding.width", &i)) {
ATTR2("window", "clientpadding", "horizontal", NUM(i)); ATTR2("window", "clientpadding", "x", NUM(i));
ATTR2("window", "clientpadding", "vertical", NUM(i)); ATTR2("window", "clientpadding", "y", NUM(i));
} }
if (read_string(db, "window.label.text.justify", &s)) { if (read_string(db, "window.label.text.justify", &s)) {