add noStrut option to dock and fix up rc.xsd, some options were in the wrong section due to hideDelay being in both dock and menu

This commit is contained in:
Mikael Magnusson 2005-03-25 20:17:45 +00:00
parent 3cc75f71a2
commit 498ae4cc20
2 changed files with 6 additions and 1 deletions

View file

@ -132,8 +132,8 @@
<xs:element name="floatingY" type="xs:integer"/> <xs:element name="floatingY" type="xs:integer"/>
<xs:element name="autoHide" type="ob:yesorno"/> <xs:element name="autoHide" type="ob:yesorno"/>
<xs:element name="hideDelay" type="xs:integer"/> <xs:element name="hideDelay" type="xs:integer"/>
<xs:element name="disktopMenuIcons" type="ob:yesorno"/>
<xs:element name="moveButton" type="ob:button"/> <xs:element name="moveButton" type="ob:button"/>
<xs:element name="noStrut" type="ob:yesorno"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="action"> <xs:complexType name="action">
@ -184,6 +184,8 @@
<xs:element maxOccurs="unbounded" name="file" type="xs:string"/> <xs:element maxOccurs="unbounded" name="file" type="xs:string"/>
<xs:element name="warpPointer" type="ob:yesorno"/> <xs:element name="warpPointer" type="ob:yesorno"/>
<xs:element name="xorStyle" type="ob:yesorno"/> <xs:element name="xorStyle" type="ob:yesorno"/>
<xs:element name="hideDelay" type="xs:integer"/>
<xs:element name="desktopMenuIcons" type="ob:yesorno"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<!-- <!--

View file

@ -361,6 +361,9 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
config_dock_x = parse_int(doc, n); config_dock_x = parse_int(doc, n);
if ((n = parse_find_node("floatingY", node))) if ((n = parse_find_node("floatingY", node)))
config_dock_y = parse_int(doc, n); config_dock_y = parse_int(doc, n);
} else {
if ((n = parse_find_node("noStrut", node)))
config_dock_floating = parse_bool(doc, n);
} }
if ((n = parse_find_node("stacking", node))) { if ((n = parse_find_node("stacking", node))) {
if (parse_contains("top", doc, n)) if (parse_contains("top", doc, n))