shithub: choc

Download patch

ref: 56dc1c62fe439af965d6c1cd1a563d41de28d1d6
parent: 1d2fe63a94c8e0fcacb3482b822018ce1fc288c8
author: Simon Howard <fraggle@soulsphere.org>
date: Wed Jan 25 16:10:48 EST 2017

setup: Simplify by using TXT_MakeTable().

We were making multiple conditional widgets just to avoid creating a
table; now we have TXT_MakeTable() it's cleaner to just use this.

--- a/src/setup/sound.c
+++ b/src/setup/sound.c
@@ -162,12 +162,9 @@
 
         TXT_NewRadioButton("GUS (emulated)", &snd_musicdevice, SNDDEVICE_GUS),
         TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GUS,
-            TXT_NewHorizBox(
+            TXT_MakeTable(2,
                 TXT_NewStrut(4, 0),
                 TXT_NewLabel("Path to patch files: "),
-                NULL)),
-        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GUS,
-            TXT_NewHorizBox(
                 TXT_NewStrut(4, 0),
                 TXT_NewFileSelector(&gus_patch_path, 34,
                                     "Select path to GUS patches",
@@ -176,12 +173,9 @@
 
         TXT_NewRadioButton("Native MIDI", &snd_musicdevice, SNDDEVICE_GENMIDI),
         TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GENMIDI,
-            TXT_NewHorizBox(
+            TXT_MakeTable(2,
                 TXT_NewStrut(4, 0),
                 TXT_NewLabel("Timidity configuration file: "),
-                NULL)),
-        TXT_NewConditional(&snd_musicdevice, SNDDEVICE_GENMIDI,
-            TXT_NewHorizBox(
                 TXT_NewStrut(4, 0),
                 TXT_NewFileSelector(&timidity_cfg_path, 34,
                                     "Select Timidity config file",