diff --git a/crates/benilla-app/assets/ui/BagFrame.xml b/crates/benilla-app/assets/ui/BagFrame.xml index 32593ff7..6ff3470f 100644 --- a/crates/benilla-app/assets/ui/BagFrame.xml +++ b/crates/benilla-app/assets/ui/BagFrame.xml @@ -306,10 +306,10 @@ -- Fixed art, again because there is no bag item: the keyring's own portrait -- (ref ContainerFrame.lua l.419) and its own background variant, snug-fitted to the -- level-gated slot count exactly like an equipped bag. - local portrait = getglobal(frame:GetName() .. "Portrait") - if portrait then - portrait:SetPortraitToTexture("Interface\\ContainerFrame\\KeyRing-Bag-Icon") - end + -- The GLOBAL form, which is the reference's own (ContainerFrame.lua l.419 + -- writes exactly this call) — 1.12 has no such Texture method. + SetPortraitToTexture(frame:GetName() .. "Portrait", + "Interface\\ContainerFrame\\KeyRing-Bag-Icon") local size = GetContainerNumSlots(bagId) if size > 0 then BenillaBagWindow_FitBackground(frame, size) end else @@ -331,7 +331,7 @@ -- The circular crop (the real SetBagPortaitTexture is C-side and masks the -- icon to the ring's inscribed circle): a raw square icon pokes its corners -- past the round rim — the director's bank-bag popout artifact. - portrait:SetPortraitToTexture(icon) + SetPortraitToTexture(frame:GetName() .. "Portrait", icon) else -- The backpack fallback art is authored round — no crop to apply. portrait:SetTexture("Interface\\Buttons\\Button-Backpack-Up") diff --git a/crates/benilla-app/assets/ui/ContainerFrameAdapters.xml b/crates/benilla-app/assets/ui/ContainerFrameAdapters.xml index 9eee5f11..6dbf4f00 100644 --- a/crates/benilla-app/assets/ui/ContainerFrameAdapters.xml +++ b/crates/benilla-app/assets/ui/ContainerFrameAdapters.xml @@ -24,7 +24,8 @@ slots, so it has to detour out of the container API to describe one. benilla's keyring is an ordinary container (id -2, decision 0765): its slots come through `GetContainerItemInfo` and `GameTooltip:SetBagItem` like every other bag's. So the detour is not merely unavailable here - (neither `KeyRingButtonIDToInvSlotID` nor `CursorUpdate` is a binding) — it is *wrong* here, + (`KeyRingButtonIDToInvSlotID` is not a binding here; `CursorUpdate` now is, transcribed from + UIParent.lua into UiPanels.xml, so only half the detour is missing) — it is *wrong* here, and supplying the two verbs would buy an empty tooltip, because our keyring items were never fed into the inventory-slot space it reads. diff --git a/crates/benilla-app/assets/ui/GossipFrame.xml b/crates/benilla-app/assets/ui/GossipFrame.xml index 8bd92818..2d444d76 100644 --- a/crates/benilla-app/assets/ui/GossipFrame.xml +++ b/crates/benilla-app/assets/ui/GossipFrame.xml @@ -115,7 +115,7 @@ -- has measured THIS text. A zero keeps the current height (never collapses the row) and -- the frame's OnUpdate below re-runs the fit until it settles. function BenillaGossipRow_Resize(button) - local h = button.label:GetStringHeight() + local h = button.label:GetHeight() if h <= 0 or button.benillaFitHeight == h then return end button.benillaFitHeight = h button:SetHeight(h + 2) diff --git a/crates/benilla-app/assets/ui/MicroMenu.xml b/crates/benilla-app/assets/ui/MicroMenu.xml index deb764f1..d68cbbd8 100644 --- a/crates/benilla-app/assets/ui/MicroMenu.xml +++ b/crates/benilla-app/assets/ui/MicroMenu.xml @@ -56,6 +56,29 @@ - The keyring button (ref KeyRingButton, `hidden="true"` by default) stays out with the keyring container itself. --> + + +