Fixes #1396

NPBruce · Nov 17, 2020 · dd6d5e7 · dd6d5e7
1 parent bf74d40
commit dd6d5e7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/unity/Assets/Scripts/UI/UIElementBorder.cs b/unity/Assets/Scripts/UI/UIElementBorder.cs
@@ -37,23 +37,22 @@ private void CreateBorder(Transform transform, RectTransform rectTrans, string t
             }
 
             // Set the thickness of the lines
-            float thick = (float)Math.Floor(thickness * UIScaler.GetPixelsPerUnit());
-            if (thick == 0)
-            {
-                thick = 1.0f;
-            }
-
-            bLine[0].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Bottom, -thick, thick);
-            bLine[0].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, -thick, rectTrans.rect.width + thick);
+            float thick = thickness * UIScaler.GetPixelsPerUnit();
 
+            // Bottom line
+            bLine[0].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Bottom, 0, thick);
+            bLine[0].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, -thick, rectTrans.rect.width);
+            // Top line
             bLine[1].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, -thick, thick);
-            bLine[1].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, -thick, rectTrans.rect.width + thick);
-            //
+            bLine[1].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, -thick, rectTrans.rect.width);
+
+            // Left line
             bLine[2].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, -thick, rectTrans.rect.height + thick);
             bLine[2].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, -thick, thick);
-            //
-            bLine[3].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, -thick, rectTrans.rect.height + 2 * thick);
-            bLine[3].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Right, -thick, thick);
+            // Right line
+            bLine[3].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, -thick, rectTrans.rect.height + thick);
+            bLine[3].GetComponent<RectTransform>().SetInsetAndSizeFromParentEdge(RectTransform.Edge.Right, 0, thick);
+
         }
 
         /// <summary>

diff --git a/unity/Assets/Scripts/UI/UIWindowSelectionListAudio.cs b/unity/Assets/Scripts/UI/UIWindowSelectionListAudio.cs
@@ -24,10 +24,7 @@ protected override float DrawItem(SelectionItemTraits item, Transform transform,
             UIElement ui = new UIElement(transform);
             ui.SetLocation(0, offset, 18.9f, 1);
             var audioFilePath = FindAudioPathIfExists(key);
-            if (!string.IsNullOrEmpty(audioFilePath))
-            {
-                ui.SetButton(delegate { SelectItem(key); });
-            }
+            ui.SetButton(delegate { SelectItem(key ?? ""); });
             ui.SetBGColor(item.GetColor());
             ui.SetText(item.GetDisplay(), Color.black);