Hide emblem box if no emblem URL is available for team info

EvoEsports · Jul 27, 2024 · d8e599e · d8e599e
1 parent 1999a5d
commit d8e599e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/Modules/TeamInfoModule/Templates/Components/TeamFullName.mt b/src/Modules/TeamInfoModule/Templates/Components/TeamFullName.mt
@@ -1,8 +1,10 @@
 <component>
     <using namespace="GbxRemoteNet.Structs"/>
 
+    <import component="EvoSC.Drawing.Rectangle" as="Rectangle"/>
+
     <property type="TmTeamInfo" name="teamInfo"/>
-    <property type="double" name="width" default="40.0"/>
+    <property type="double" name="width" default="45.0"/>
     <property type="double" name="height" default="10.0"/>
     <property type="double" name="barHeight" default="1.0"/>
     <property type="double" name="x" default="0.0"/>
@@ -11,8 +13,11 @@
 
     <template>
         <frame pos='{{ x - (halign=="right" ? width : 0) }} {{ y }}'>
-            <quad size="{{ width }} {{ height }}"
-                  bgcolor="{{ teamInfo.RGB }}"
+            <Rectangle width="{{ width }}"
+                       height="{{ height }}"
+                       bgColor="{{ teamInfo.RGB }}"
+                       cornerRadius="0.75"
+                       corners='{{ string.IsNullOrEmpty(teamInfo.EmblemUrl) ? (halign=="right" ? "BottomLeft" : "BottomRight") : "" }}'
             />
             <quad pos='{{ halign=="right" ? 0 : width }} {{ halign=="right" ? -height : -barHeight }}'
                   rot='{{ halign=="right" ? -90 : 90 }}'

diff --git a/src/Modules/TeamInfoModule/Templates/TeamInfoWidget.mt b/src/Modules/TeamInfoModule/Templates/TeamInfoWidget.mt
@@ -44,8 +44,9 @@
                           teamInfo="{{ team1 }}"
                           halign="right"
             />
-            <frame pos="{{ settings.CompactMode ? 0.0 : -40.0 }} 0">
-                <EmblemBox x="-22.0"
+            <frame pos="{{ settings.CompactMode ? 0.0 : -45.0 }} 0">
+                <EmblemBox if="!string.IsNullOrEmpty(team1.EmblemUrl)"
+                           x="-22.0"
                            teamInfo="{{ team1 }}"
                            halign="right"
                 />
@@ -68,8 +69,9 @@
                           x="22.0"
                           teamInfo="{{ team2 }}"
             />
-            <frame pos="{{ settings.CompactMode ? 0.0 : 40.0 }} 0">
-                <EmblemBox x="22.0"
+            <frame pos="{{ settings.CompactMode ? 0.0 : 45.0 }} 0">
+                <EmblemBox if="!string.IsNullOrEmpty(team2.EmblemUrl)"
+                           x="22.0"
                            teamInfo="{{ team2 }}"
                 />
                 <MatchPointBox if="team2MatchPoint"