Refactor the UI code to something more generic.

dulsi · Oct 2, 2016 · 1c3a067 · 1c3a067
1 parent b6f5a62
commit 1c3a067
Show file tree

Hide file tree

Showing 16 changed files with 962 additions and 666 deletions.
diff --git a/data/display.xml b/data/display.xml
@@ -2,11 +2,13 @@
 	<width>320</width>
 	<height>200</height>
 	<expanded><xMult>2</xMult><yMult>2</yMult><directory>640x400</directory></expanded>
-	<background>ui/gamescreen.png</background>
 	<x3d>16</x3d>
 	<y3d>15</y3d>
-	<label><name>main</name><location><x>16</x><y>103</y><w>112</w><h>13</h></location></label>
-	<text><x>168</x><y>14</y><w>136</w><h>96</h></text>
+	<layout>
+		<background>ui/gamescreen.png</background>
+		<label><name>main</name><location><x>16</x><y>103</y><w>112</w><h>13</h></location></label>
+		<text><name>text</name><location><x>168</x><y>14</y><w>136</w><h>96</h></location></text>
+	</layout>
 	<status number="1"><x>10</x><y>144</y><w>302</w><h>8</h></status>
 	<status number="2"><x>10</x><y>152</y><w>302</w><h>8</h></status>
 	<status number="3"><x>10</x><y>160</y><w>302</w><h>8</h></status>

diff --git a/data/mainscreen.xml b/data/mainscreen.xml
@@ -2,6 +2,8 @@
 	<width>320</width>
 	<height>200</height>
 	<expanded><xMult>2</xMult><yMult>2</yMult><directory>640x400</directory></expanded>
-	<background>ui/mainscreen.png</background>
-	<text><x>165</x><y>24</y><w>120</w><h>133</h></text>
+	<layout>
+		<background>ui/mainscreen.png</background>
+		<text><name>text</name><location><x>165</x><y>24</y><w>120</w><h>133</h></location></text>
+	</layout>
 </display>
diff --git a/data/mapedit.xml b/data/mapedit.xml
@@ -2,13 +2,19 @@
 	<width>320</width>
 	<height>200</height>
 	<expanded><xMult>2</xMult><yMult>2</yMult><directory>640x400</directory></expanded>
-	<background>ui/mapedit.png</background>
 	<x3d>4</x3d>
 	<y3d>4</y3d>
-	<text><x>6</x><y>9</y><w>128</w><h>186</h></text>
-	<label><name>wall</name><location><x>4</x><y>100</y><w>112</w><h>13</h></location></label>
-	<label><name>main</name><location><x>4</x><y>120</y><w>112</w><h>13</h></location></label>
-	<label><name>street</name><location><x>4</x><y>140</y><w>112</w><h>13</h></location></label>
+	<layout>
+		<background>ui/mapedit.png</background>
+		<label><name>wall</name><location><x>4</x><y>100</y><w>112</w><h>13</h></location></label>
+		<label><name>main</name><location><x>4</x><y>120</y><w>112</w><h>13</h></location></label>
+		<label><name>street</name><location><x>4</x><y>140</y><w>112</w><h>13</h></location></label>
+	</layout>
+	<layout>
+		<background>ui/mapedit_select.png</background>
+		<visible>false</visible>
+		<text><name>text</name><location><x>6</x><y>9</y><w>128</w><h>186</h></location></text>
+	</layout>
 	<xMap>141</xMap>
 	<yMap>4</yMap>
 	<widthMap>22</widthMap>

diff --git a/data/pictureselect.xml b/data/pictureselect.xml
@@ -2,8 +2,10 @@
 	<width>320</width>
 	<height>200</height>
 	<expanded><xMult>2</xMult><yMult>2</yMult><directory>640x400</directory></expanded>
-	<background>ui/specialedit.png</background>
 	<x3d>103</x3d>
 	<y3d>10</y3d>
-	<text><x>10</x><y>108</y><w>310</w><h>180</h></text>
+	<layout>
+		<background>ui/specialedit.png</background>
+		<text><name>text</name><location><x>10</x><y>108</y><w>310</w><h>180</h></location></text>
+	</layout>
 </display>
diff --git a/data/specialedit.xml b/data/specialedit.xml
@@ -2,8 +2,10 @@
 	<width>320</width>
 	<height>200</height>
 	<expanded><xMult>2</xMult><yMult>2</yMult><directory>640x400</directory></expanded>
-	<background>ui/specialedit.png</background>
 	<x3d>103</x3d>
 	<y3d>55</y3d>
-	<text><x>10</x><y>10</y><w>310</w><h>180</h></text>
+	<layout>
+		<background>ui/specialedit.png</background>
+		<text><name>text</name><location><x>10</x><y>10</y><w>310</w><h>180</h></location></text>
+	</layout>
 </display>