Merge branch 'main' into mini-sync

argonui · Jan 9, 2025 · 9adab13 · 9adab13
2 parents 489b84c + 6c5961a
commit 9adab13
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 30 deletions.
diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
@@ -1615,11 +1615,11 @@ function createActionTrackerUI()
       active        = visibilityString ~= "",
       height        = 30 * #usedMatColors,
       width         = "300",
-      offsetXY      = "2 0",
+      offsetXY      = "-2 400",
       columnWidths  = "0 25 25 25 25 25",
       padding       = "4 4 4 4",
       cellSpacing   = "5",
-      rectAlignment = "MiddleLeft",
+      rectAlignment = "LowerRight",
       raycastTarget = true,
       outlineSize   = "2 2",
       outline       = "#303030"
@@ -1666,7 +1666,6 @@ function createActionTrackerUI()
   local xml = UI.getXmlTable()
   table.insert(xml, actionTrackerXml)
   updateGlobalXml(xml)
-  updateActionTrackerToggleButton(#usedMatColors)
 end
 
 -- updates the layout of the action tracker
@@ -1681,12 +1680,6 @@ function updateActionTrackerRows()
   for matColor, _ in pairs(guidReferenceApi.getObjectsByType("Playermat")) do
     UI.setAttribute("playerRow" .. matColor, "active", isUsed[matColor] or false)
   end
-
-  updateActionTrackerToggleButton(#usedMatColors)
-end
-
-function updateActionTrackerToggleButton(usedMatCount)
-  UI.setAttribute("actionTrackerToggleButton", "offsetXY", "1 " .. tostring(15 * usedMatCount) + 16)
 end
 
 -- updates the color of the actions based on the playermats actions tokens

diff --git a/xml/Global/BlessCurseManager.xml b/xml/Global/BlessCurseManager.xml
@@ -19,7 +19,7 @@
   active="false"
   height="104"
   width="144"
-  offsetXY="-1 250"
+  offsetXY="-1 290"
   rectAlignment="LowerRight"
   raycastTarget="true"
   outlineSize="2 2"

diff --git a/xml/Global/BottomBar.xml b/xml/Global/BottomBar.xml
@@ -4,43 +4,30 @@
     tooltipPosition="Left"
     tooltipBackgroundColor="rgba(0,0,0,1)"
     color="clear"/>
-  <Button class="barLeft"
-    tooltipOffset="-300"
-    tooltipPosition="Right"
-    tooltipBackgroundColor="rgba(0,0,0,1)"
-    color="clear"/>
   <VerticalLayout class="navbar"
     width="800"
-    height="1600"
     padding="75 75 75 75"
     scale="0.05 0.05 1"
     color="#000000"
     outlineSize="20 20"
     outline="#303030"
     rectAlignment="LowerRight"/>
-  <VerticalLayout class="barLeft"
-    width="800"
-    height="800"
-    padding="75 75 75 75"
-    scale="0.035 0.035 1"
-    color="#000000"
-    outlineSize="20 20"
-    outline="#303030"
-    rectAlignment="MiddleLeft"/>
 </Defaults>
 
 <!-- Action Tracker -->
-<VerticalLayout class="barLeft"
-  id="actionTrackerToggleButton">
-  <Button class="barLeft"
+<VerticalLayout class="navbar"
+  offsetXY="-1 240"
+  height="800">
+  <Button class="navbar"
     icon="actionTrackerToggle"
     tooltip="Action Tracker"
     onClick="onClick_toggleUi(actionTracker)"/>
 </VerticalLayout>
 
 <!-- Navigation Overlay + Bless / Curse Manager (height: n * width) -->
 <VerticalLayout class="navbar"
-  offsetXY="-1 160">
+  offsetXY="-1 160"
+  height="1600">
   <Button class="navbar"
     icon="blurse"
     tooltip="Bless/Curse Manager"
@@ -54,7 +41,8 @@
 <!-- Download Menu + Option Panel (height: n * width) -->
 <VerticalLayout class="navbar"
   visibility="Admin"
-  offsetXY="-1 80">
+  offsetXY="-1 80"
+  height="1600">
   <Button class="navbar"
     icon="devourer"
     tooltip="Downloadable Content"