9.2.1

esoui · Sep 25, 2023 · 7b1b806 · 7b1b806
1 parent 065c356
commit 7b1b806
Show file tree

Hide file tree

Showing 52 changed files with 15,054 additions and 14,659 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ If you're a Zenimax Media Inc. representative and have any objection to any of t
 
 This repo is also available at http://www.esoui.com/downloads/info1213-ESOUI-TheElderScrollsOnlinesourcecode.html
 
-**Last update: 9.2.0 (API 101040) on 20 Sep 2023.**
+**Last update: 9.2.1 (API 101040) on 25 Sep 2023.**
 
 *Join ESOUI Dev Community on Gitter :*
 

diff --git a/esoui/ingame/centerscreenannounce/centerscreenannounce.xml b/esoui/ingame/centerscreenannounce/centerscreenannounce.xml
@@ -123,13 +123,13 @@
                     </EasingFunction>
                 </AlphaAnimation>
 
-                <CustomAnimation duration="1000" delay="3500">
+                <CustomAnimation duration="1000" delay="2500">
                     <UpdateFunction>
                         ZO_CenterScreenEndlessDungeonBuffAddedAnimation_OnUpdate(self, progress)
                     </UpdateFunction>
                 </CustomAnimation>
 
-                <AlphaAnimation duration="1000" delay="3500" startAlpha="1" endAlpha="0">
+                <AlphaAnimation duration="1000" delay="2500" startAlpha="1" endAlpha="0">
                     <EasingFunction>
                         return ZO_EaseInQuintic(progress)
                     </EasingFunction>

diff --git a/esoui/ingame/centerscreenannounce/centerscreenannouncehandlers.lua b/esoui/ingame/centerscreenannounce/centerscreenannouncehandlers.lua
@@ -813,10 +813,10 @@ local function GetEndlessDungeonProgressMessageParams()
     local progressData =
     {
         {
-            iconTexture = stageIcon,
-            narrationDescription = stageNarration,
-            initialValue = previousStage,
-            finalValue = stage,
+            iconTexture = arcIcon,
+            narrationDescription = arcNarration,
+            initialValue = previousArc,
+            finalValue = arc,
         },
         {
             iconTexture = cycleIcon,
@@ -825,10 +825,10 @@ local function GetEndlessDungeonProgressMessageParams()
             finalValue = cycle,
         },
         {
-            iconTexture = arcIcon,
-            narrationDescription = arcNarration,
-            initialValue = previousArc,
-            finalValue = arc,
+            iconTexture = stageIcon,
+            narrationDescription = stageNarration,
+            initialValue = previousStage,
+            finalValue = stage,
         },
     }
     messageParams:SetRollingMeterProgressData(progressData)

diff --git a/esoui/ingame/crafting/keyboard/craftadvisor_keyboard.lua b/esoui/ingame/crafting/keyboard/craftadvisor_keyboard.lua
@@ -134,9 +134,7 @@ function ZO_CraftAdvisor_Keyboard:OnShowing()
         self.initializedTabs = true
     end
 
-    if self.dirty then
-        self:RefreshTabs()
-    end
+    self:RefreshTabs()
 end
 
 function ZO_CraftAdvisor_Keyboard:OnHidden()

diff --git a/esoui/ingame/crafting/keyboard/craftadvisor_keyboard.xml b/esoui/ingame/crafting/keyboard/craftadvisor_keyboard.xml
@@ -1,6 +1,6 @@
 <GuiXml>
     <Controls>
-        <TopLevelControl name="ZO_CraftAdvisor_Keyboard_TopLevel" hidden="true">
+        <TopLevelControl name="ZO_CraftAdvisor_Keyboard_TopLevel" level="1" hidden="true">
             <Anchor point="TOPLEFT" relativeTo="ZO_SharedMediumLeftPanelBackground" />
             <Anchor point="BOTTOMRIGHT" relativeTo="ZO_SharedMediumLeftPanelBackground" offsetX="-20" offsetY="-15"/>
 

diff --git a/esoui/ingame/endlessdungeon/endlessdungeonbufftracker_shared.lua b/esoui/ingame/endlessdungeon/endlessdungeonbufftracker_shared.lua
@@ -7,14 +7,14 @@ ZO_EndlessDungeonBuffTracker_Shared = ZO_DeferredInitializingObject:Subclass()
 function ZO_EndlessDungeonBuffTracker_Shared:Initialize(control)
     self.control = control
     control.object = self
+    self.progressLabel = self.control:GetNamedChild("Progress")
     self.nextInstanceIntervalOffsetS = 0
 
     local scene = ZO_Scene:New(self:GetSceneName(), SCENE_MANAGER)
     self.scene = scene
     self.fragment = ZO_FadeSceneFragment:New(control)
     scene:AddFragment(self.fragment)
 
-    self.progressLabel = self.control:GetNamedChild("Progress")
     -- AddOnLoaded is fired before DeferredInitialize will ever be called, so we have to do
     -- this here instead of in InitializeEvents.
     local function OnAddOnLoaded(_, name)
@@ -38,10 +38,15 @@ end
 function ZO_EndlessDungeonBuffTracker_Shared:InitializeControls()
     self.gridListControl = self.control:GetNamedChild("List")
     self.emptyLabel = self.control:GetNamedChild("Empty")
+    self.titleLabel = self.control:GetNamedChild("Title")
 
-    local keybindContainer = self.control:GetNamedChild("KeybindContainer")
-    self.switchToSummaryKeybindButton = keybindContainer:GetNamedChild("SwitchToSummary")
-    self.closeKeybindButton = keybindContainer:GetNamedChild("Close")
+    self.keybindContainer = self.control:GetNamedChild("KeybindContainer")
+    self.switchToSummaryKeybindButton = self.keybindContainer:GetNamedChild("SwitchToSummary")
+    self.closeKeybindButton = self.keybindContainer:GetNamedChild("Close")
+
+    self.keybindContainer:SetHandler("OnRectChanged", function()
+        self:UpdateWindowDimensions()
+    end)
 end
 
 function ZO_EndlessDungeonBuffTracker_Shared:InitializeGridList(gridScrollListTemplate, gridEntryTemplateName, gridHeaderTemplateName, gridSelectionTemplateName)
@@ -181,6 +186,8 @@ function ZO_EndlessDungeonBuffTracker_Shared:UpdateKeybinds()
     else
         self.closeKeybindButton:SetAnchor(TOPLEFT, self.switchToSummaryKeybindButton, TOPRIGHT, 40, 0)
     end
+
+    self:UpdateWindowDimensions()
 end
 
 function ZO_EndlessDungeonBuffTracker_Shared:UpdateProgress()
@@ -247,32 +254,54 @@ function ZO_EndlessDungeonBuffTracker_Shared:UpdateGridList()
     self.entryDataObjectPool:ReleaseAllObjects()
     local numVerseEntries = self:AddGridListBuffEntries(ENDLESS_DUNGEON_BUFF_TYPE_VERSE, GetString(SI_ENDLESS_DUNGEON_SUMMARY_VERSES_HEADER))
     local numVisionEntries = self:AddGridListBuffEntries(ENDLESS_DUNGEON_BUFF_TYPE_VISION, GetString(SI_ENDLESS_DUNGEON_SUMMARY_VISIONS_HEADER))
-    self:UpdateGridListDimensions(numVerseEntries, numVisionEntries)
     local isListEmpty = (numVerseEntries + numVisionEntries) == 0
     self.emptyLabel:SetHidden(not isListEmpty)
+    self:UpdateGridListDimensions(numVerseEntries, numVisionEntries)
     gridList:CommitGridList()
 end
 
-function ZO_EndlessDungeonBuffTracker_Shared:UpdateGridListDimensions(numVerseEntries, numVisionEntries, gridEntryWidth, gridEntryRowHeight, gridHeaderRowHeight, gridPaddingY)
-    local entriesPerRow = zo_floor(self.gridListControl:GetWidth() / gridEntryWidth)
+function ZO_EndlessDungeonBuffTracker_Shared:UpdateGridListDimensions(numVerseEntries, numVisionEntries, maxGridWidth, gridEntryWidth, gridEntryRowHeight, gridHeaderRowHeight, gridPaddingY)
+    local maxColumns = zo_floor(maxGridWidth / gridEntryWidth)
     local numRowsAvailable = ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_MAX_ENTRY_ROWS
 
     local versesHeight = 0
     if numVerseEntries > 0 then
-        local numVerseRows = zo_min(zo_ceil(numVerseEntries / entriesPerRow), numRowsAvailable)
+        local numVerseRows = zo_min(zo_ceil(numVerseEntries / maxColumns), numRowsAvailable)
         numRowsAvailable = numRowsAvailable - numVerseRows
         versesHeight = gridHeaderRowHeight + numVerseRows * gridEntryRowHeight
     end
 
     local visionsHeight = 0
     if numVisionEntries > 0 then
-        local numVisionRows = zo_min(zo_ceil(numVisionEntries / entriesPerRow), numRowsAvailable)
+        local numVisionRows = zo_min(zo_ceil(numVisionEntries / maxColumns), numRowsAvailable)
         visionsHeight = gridHeaderRowHeight + numVisionRows * gridEntryRowHeight
     end
 
     local sectionPadding = (versesHeight > 0 and visionsHeight > 0) and gridPaddingY or 0
     local totalHeight = versesHeight + visionsHeight + sectionPadding
     self.gridListControl:SetHeight(totalHeight)
+
+    local gridWidthMargin = maxGridWidth % gridEntryWidth
+    local maxBuffsByType = zo_max(numVerseEntries, numVisionEntries)
+    local numColumns = zo_min(maxBuffsByType, maxColumns)
+    local gridWidth = (gridWidthMargin * zo_min(numColumns, 1)) + (numColumns * gridEntryWidth)
+    self.gridListControl:SetWidth(gridWidth)
+
+    self:UpdateWindowDimensions()
+end
+
+function ZO_EndlessDungeonBuffTracker_Shared:UpdateWindowDimensions()
+    local minWidth = zo_max(self.progressLabel:GetWidth(), self.titleLabel:GetWidth())
+    minWidth = zo_max(minWidth, self.keybindContainer:GetWidth())
+    if self.emptyLabel:IsHidden() then
+        minWidth = zo_max(minWidth, self.gridListControl:GetWidth())
+    else
+        minWidth = zo_max(minWidth, self.emptyLabel:GetWidth())
+    end
+
+    local WINDOW_WIDTH_MARGIN = 50
+    local windowWidth = minWidth + WINDOW_WIDTH_MARGIN
+    self.control:SetWidth(windowWidth)
 end
 
 function ZO_EndlessDungeonBuffTracker_Shared:OnBuffStackCountChanged(buffType, abilityId, stackCount, previousStackCount)

diff --git a/esoui/ingame/endlessdungeon/endlessdungeonbufftracker_shared.xml b/esoui/ingame/endlessdungeon/endlessdungeonbufftracker_shared.xml
@@ -41,6 +41,18 @@
                 <Label name="$(parent)Empty" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_NORMAL" text="SI_ENDLESS_DUNGEON_BUFF_TRACKER_EMPTY">
                     <Anchor point="TOP" relativeTo="$(parent)Progress" relativePoint="BOTTOM" offsetY="15" />
                 </Label>
+
+                <Control name="$(parent)KeybindContainer" excludeFromResizeToFitExtents="true" resizeToFitDescendents="true">
+                    <Controls>
+                        <Control name="$(parent)SwitchToSummary" inherits="ZO_KeybindButton" hidden="true">
+                            <Anchor point="TOPLEFT" />
+                        </Control>
+
+                        <Control name="$(parent)Close" inherits="ZO_KeybindButton">
+                            <Anchor point="TOPLEFT" relativeTo="$(parent)SwitchToSummary" relativePoint="TOPRIGHT" offsetX="40" />
+                        </Control>
+                    </Controls>
+                </Control>
             </Controls>
         </TopLevelControl>
     </Controls>

diff --git a/esoui/ingame/endlessdungeon/endlessdungeonmanager.lua b/esoui/ingame/endlessdungeon/endlessdungeonmanager.lua
@@ -238,7 +238,7 @@ end
 
 function ZO_EndlessDungeonManager.GetProgressionText(stage, cycle, arc)
     local stageIcon, cycleIcon, arcIcon = ZO_EndlessDungeonManager.GetProgressionIconStrings()
-    local output = string.format("%s%d %s%d %s%d", stageIcon, stage, cycleIcon, cycle, arcIcon, arc)
+    local output = string.format("%s%d %s%d %s%d", arcIcon, arc, cycleIcon, cycle, stageIcon, stage)
     return output
 end
 
@@ -379,6 +379,7 @@ function ZO_EndlessDungeonManager:UpdateDungeonBuffs()
         end
     end
 
+    local state = self.state
     if state == ZO_ENDLESS_DUNGEON_STATES.INACTIVE then
         -- The local player is not in an Endless Dungeon
         -- or the instance has not started.

diff --git a/esoui/ingame/endlessdungeon/endlessdungeonsummary.lua b/esoui/ingame/endlessdungeon/endlessdungeonsummary.lua
@@ -56,7 +56,10 @@ function ZO_EndlessDungeonSummary:InitializeKeybindStripDescriptor()
         ethereal = true,
         narrateEthereal = true,
         etherealNarrationOrder = 2,
-        -- Callback is in bindings.xml
+        callback = function()
+            -- For when the user clicks the button
+            SCENE_MANAGER:HideCurrentScene()
+        end
     }
 
     self.switchToBuffsKeybindButton:SetKeybindButtonDescriptor(switchToBuffsKeybindDescriptor)
@@ -70,7 +73,7 @@ function ZO_EndlessDungeonSummary:InitializeKeybindStripDescriptor()
     {
         -- Switch To Tracker
         switchToBuffsKeybindDescriptor,
-        -- Close
+        -- Close (For narration only)
         closeDescriptor,
         -- Back Button (Hidden)
         backKeybindDescriptor,
@@ -92,12 +95,12 @@ function ZO_EndlessDungeonSummary:InitializeNarrationInfo()
             -- Progress Header
             ZO_AppendNarration(narrations, SCREEN_NARRATION_MANAGER:CreateNarratableObject(GetString(SI_ENDLESS_DUNGEON_SUMMARY_PROGRESS_HEADER)))
 
-            --Stage/Cyce/Arc
+            --Arc/Cycle/Stage
             local stageNarration, cycleNarration, arcNarration = endlessDungeonManager:GetCurrentProgressionNarrationDescriptions()
             ZO_AppendNarration(narrations, SCREEN_NARRATION_MANAGER:CreateNarratableObject(GetString(SI_ENDLESS_DUNGEON_SUMMARY_STAGE_HEADER)))
-            ZO_AppendNarration(narrations, SCREEN_NARRATION_MANAGER:CreateNarratableObject(stageNarration))
-            ZO_AppendNarration(narrations, SCREEN_NARRATION_MANAGER:CreateNarratableObject(cycleNarration))
             ZO_AppendNarration(narrations, SCREEN_NARRATION_MANAGER:CreateNarratableObject(arcNarration))
+            ZO_AppendNarration(narrations, SCREEN_NARRATION_MANAGER:CreateNarratableObject(cycleNarration))
+            ZO_AppendNarration(narrations, SCREEN_NARRATION_MANAGER:CreateNarratableObject(stageNarration))
 
             -- Score
             local scoreNarration = zo_strformat(SI_ENDLESS_DUNGEON_SUMMARY_STAT_VALUE_NARRATION, GetString(SI_ENDLESS_DUNGEON_SUMMARY_SCORE_HEADER), endlessDungeonManager:GetScore())

diff --git a/esoui/ingame/endlessdungeon/gamepad/endlessdungeonbufftracker_gamepad.lua b/esoui/ingame/endlessdungeon/gamepad/endlessdungeonbufftracker_gamepad.lua
@@ -7,7 +7,8 @@ ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_GAMEPAD_Y = 0
 ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_ROW_HEIGHT_GAMEPAD = ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_GAMEPAD_Y + ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_GAMEPAD_Y
 ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_WIDTH_GAMEPAD = ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_GAMEPAD_X + ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_GAMEPAD_X
 ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_GAMEPAD = 50
-ZO_ENDLESS_DUNGEON_BUFF_GRID_SECTION_PADDING_GAMEPAD_Y = 15
+ZO_ENDLESS_DUNGEON_BUFF_GRID_SECTION_PADDING_GAMEPAD_Y = 20
+ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_MAX_WIDTH_GAMEPAD = 655
 
 ZO_EndlessDungeonBuffTracker_Gamepad = ZO_EndlessDungeonBuffTracker_Shared:Subclass()
 
@@ -99,15 +100,16 @@ function ZO_EndlessDungeonBuffTracker_Gamepad:OnGridEntrySelected(previousData,
 end
 
 function ZO_EndlessDungeonBuffTracker_Gamepad:UpdateGridListDimensions(numVerseEntries, numVisionEntries)
-    ZO_EndlessDungeonBuffTracker_Shared.UpdateGridListDimensions(self, numVerseEntries, numVisionEntries, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_WIDTH_GAMEPAD, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_ROW_HEIGHT_GAMEPAD, ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_GAMEPAD, ZO_ENDLESS_DUNGEON_BUFF_GRID_SECTION_PADDING_GAMEPAD_Y)
+    ZO_EndlessDungeonBuffTracker_Shared.UpdateGridListDimensions(self, numVerseEntries, numVisionEntries, ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_MAX_WIDTH_GAMEPAD, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_WIDTH_GAMEPAD, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_ROW_HEIGHT_GAMEPAD, ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_GAMEPAD, ZO_ENDLESS_DUNGEON_BUFF_GRID_SECTION_PADDING_GAMEPAD_Y)
 end
 
 -- Overridden from base
 function ZO_EndlessDungeonBuffTracker_Gamepad:UpdateProgress()
     ZO_EndlessDungeonBuffTracker_Shared.UpdateProgress(self)
 
     if ENDLESS_DUNGEON_MANAGER:IsEndlessDungeonStarted() then
-        self.progressionNarrationText = { ENDLESS_DUNGEON_MANAGER:GetCurrentProgressionNarrationDescriptions() }
+        local stageNarration, cycleNarration, arcNarration = ENDLESS_DUNGEON_MANAGER:GetCurrentProgressionNarrationDescriptions()
+        self.progressionNarrationText = { arcNarration, cycleNarration, stageNarration }
 
         if self:IsShowing() then
             local NARRATE_HEADER = true

diff --git a/esoui/ingame/endlessdungeon/gamepad/endlessdungeonbufftracker_gamepad.xml b/esoui/ingame/endlessdungeon/gamepad/endlessdungeonbufftracker_gamepad.xml
@@ -50,22 +50,12 @@
                 <Control name="$(parent)List" inherits="ZO_GridScrollList_Gamepad">
                     <Anchor point="TOP" relativeTo="$(parent)Progress" relativePoint="BOTTOM" offsetX="ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_OFFSET_X" offsetY="ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_OFFSET_Y" />
                     <!-- The height of this list is adjusted dynamically by ZO_EndlessDungeonBuffTracker_Gamepad:UpdateGridListDimensions -->
-                    <Dimensions x="655" />
-                    <DimensionConstraints maxY="750" />
+                    <Dimensions x="ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_MAX_WIDTH_GAMEPAD" />
+                    <DimensionConstraints maxY="730" />
                 </Control>
 
-                <Control name="$(parent)KeybindContainer" resizeToFitDescendents="true" excludeFromResizeToFitExtents="true">
+                <Control name="$(parent)KeybindContainer" override="true">
                     <Anchor point="TOP" relativePoint="BOTTOM" offsetY="20" />
-
-                    <Controls>
-                        <Control name="$(parent)SwitchToSummary" inherits="ZO_KeybindButton" hidden="true">
-                            <Anchor point="TOPLEFT" />
-                        </Control>
-
-                        <Control name="$(parent)Close" inherits="ZO_KeybindButton">
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)SwitchToSummary" relativePoint="TOPRIGHT" offsetX="40" />
-                        </Control>
-                    </Controls>
                 </Control>
             </Controls>
         </TopLevelControl>

diff --git a/esoui/ingame/endlessdungeon/keyboard/endlessdungeonbufftracker_keyboard.lua b/esoui/ingame/endlessdungeon/keyboard/endlessdungeonbufftracker_keyboard.lua
@@ -8,6 +8,7 @@ ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_ROW_HEIGHT_KEYBOARD = ZO_ENDLESS_DUNGEON_BUFF
 ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_WIDTH_KEYBOARD = ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_KEYBOARD_X + ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_KEYBOARD_X
 ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_KEYBOARD = 32
 ZO_ENDLESS_DUNGEON_BUFF_GRID_SECTION_PADDING_KEYBOARD_Y = 20
+ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_MAX_WIDTH_KEYBOARD = 390
 
 ZO_EndlessDungeonBuffTracker_Keyboard = ZO_EndlessDungeonBuffTracker_Shared:Subclass()
 
@@ -68,7 +69,7 @@ function ZO_EndlessDungeonBuffTracker_Keyboard:GetSceneName()
 end
 
 function ZO_EndlessDungeonBuffTracker_Keyboard:UpdateGridListDimensions(numVerseEntries, numVisionEntries)
-    ZO_EndlessDungeonBuffTracker_Shared.UpdateGridListDimensions(self, numVerseEntries, numVisionEntries, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_WIDTH_KEYBOARD, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_ROW_HEIGHT_KEYBOARD, ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_KEYBOARD, ZO_ENDLESS_DUNGEON_BUFF_GRID_SECTION_PADDING_KEYBOARD_Y)
+    ZO_EndlessDungeonBuffTracker_Shared.UpdateGridListDimensions(self, numVerseEntries, numVisionEntries, ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_MAX_WIDTH_KEYBOARD, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_WIDTH_KEYBOARD, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_ROW_HEIGHT_KEYBOARD, ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_KEYBOARD, ZO_ENDLESS_DUNGEON_BUFF_GRID_SECTION_PADDING_KEYBOARD_Y)
 end
 
 function ZO_EndlessDungeonBuffTracker_Keyboard.OnControlInitialized(control)

diff --git a/esoui/ingame/endlessdungeon/keyboard/endlessdungeonbufftracker_keyboard.xml b/esoui/ingame/endlessdungeon/keyboard/endlessdungeonbufftracker_keyboard.xml
@@ -58,22 +58,12 @@
                 <Control name="$(parent)List" inherits="ZO_GridScrollList_Keyboard">
                     <Anchor point="TOP" relativeTo="$(parent)Progress" relativePoint="BOTTOM" offsetX="ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_OFFSET_X" offsetY="ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_OFFSET_Y" />
                     <!-- The height of this list is adjusted dynamically by ZO_EndlessDungeonBuffTracker_Keyboard:UpdateGridListDimensions -->
-                    <Dimensions x="390" />
+                    <Dimensions x="ZO_ENDLESS_DUNGEON_BUFF_TRACKER_GRID_LIST_MAX_WIDTH_KEYBOARD" />
                     <DimensionConstraints maxY="500" />
                 </Control>
 
-                <Control name="$(parent)KeybindContainer" excludeFromResizeToFitExtents="true" resizeToFitDescendents="true">
+                <Control name="$(parent)KeybindContainer" override="true">
                     <Anchor point="BOTTOM" offsetY="-15" />
-
-                    <Controls>
-                        <Control name="$(parent)SwitchToSummary" inherits="ZO_KeybindButton" hidden="true">
-                            <Anchor point="TOPLEFT" />
-                        </Control>
-
-                        <Control name="$(parent)Close" inherits="ZO_KeybindButton">
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)SwitchToSummary" relativePoint="TOPRIGHT" offsetX="40" />
-                        </Control>
-                    </Controls>
                 </Control>
             </Controls>
         </TopLevelControl>