From ef2cba0f8552916d39ce80387d3f9cd6402a3292 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 20 Feb 2017 21:21:37 +0100
Subject: [PATCH] Display multitouch settings properly on low resolutions

---
 data/gui/multitouch_settings.stkgui | 131 ++++++++++++++--------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/data/gui/multitouch_settings.stkgui b/data/gui/multitouch_settings.stkgui
index 1cf3857bf..4ea7bd71d 100644
--- a/data/gui/multitouch_settings.stkgui
+++ b/data/gui/multitouch_settings.stkgui
@@ -4,76 +4,75 @@
         <header id="title" width="100%" height="fit" text_align="center" word_wrap="true" text="Touch Device Settings" />
 
         <spacer height="35" width="10" />
-	
-	<label width="100%" I18N="In the multitouch settings screen" text="General"/>
 
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Device enabled"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
+        <label width="100%" I18N="In the multitouch settings screen" text="General"/>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Device enabled"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
                 <checkbox id="buttons_enabled"/>
-	    </div>
-	</div>
+            </div>
+        </div>
 
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Buttons scale"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-		<gauge id="scale" proportion="1" min_value="50" max_value="150"/>
-	    </div>
-	</div>
-	
-	<label width="100%" I18N="In the multitouch settings screen" text="Accelerometer"/>
-    
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Disabled"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Buttons scale"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <gauge id="scale" proportion="1" min_value="50" max_value="150"/>
+            </div>
+        </div>
+
+        <label width="100%" I18N="In the multitouch settings screen" text="Accelerometer"/>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Disabled"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
                 <checkbox id="accelerometer_disabled"/>
-	    </div>
-	</div>
-	
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Phone"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-                <checkbox id="accelerometer_phone"/>
-	    </div>
-	</div>
-	
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Tablet"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-                <checkbox id="accelerometer_tablet"/>
-	    </div>
-	</div>
-	
-	<label width="100%" I18N="In the multitouch settings screen" text="Advanced"/>
-	
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Deadzone center"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-		<gauge id="deadzone_center" proportion="1" min_value="0" max_value="50"/>
-	    </div>
-	</div>
-    
-	<div width="75%" height="fit" layout="horizontal-row" >
-	    <label proportion="1" height="100%" text_align="right" I18N="In the multitouch settings screen" text="Deadzone edge"/>
-	    <div proportion="1" height="fit" layout="horizontal-row" >
-		<spacer width="40" height="100%" />
-		<gauge id="deadzone_edge" proportion="1" min_value="0" max_value="50"/>
-	    </div>
-	</div>
-    
-	<spacer height="35" width="10"/>
+            </div>
+        </div>
 
-	<div width="fit" height="fit" layout="horizontal-row" align="center">
-	    <button id="restore" text="Restore defaults"/>
-	    <spacer width="40" height="100%" />
-	    <button id="close" text="Apply"/>
-	</div>
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Phone"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="accelerometer_phone"/>
+            </div>
+        </div>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Tablet"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="accelerometer_tablet"/>
+            </div>
+        </div>
+
+        <label width="100%" I18N="In the multitouch settings screen" text="Advanced"/>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Deadzone center"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <gauge id="deadzone_center" proportion="1" min_value="0" max_value="50"/>
+            </div>
+        </div>
+
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Deadzone edge"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <gauge id="deadzone_edge" proportion="1" min_value="0" max_value="50"/>
+            </div>
+        </div>
+
+        <spacer height="35" width="10"/>
+
+        <div width="fit" height="fit" layout="horizontal-row" align="center" proportion="1">
+            <button id="restore" text="Restore defaults"/>
+            <spacer width="40" height="10" />
+            <button id="close" text="Apply"/>
+        </div>
     </div>
-    
 </stkgui>