Fix updating of slottexture attributes after scaling

RagedUnicorn · Dec 20, 2019 · c223e4c · c223e4c
1 parent e1a976c
commit c223e4c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/gui/GM_ChangeMenu.lua b/gui/GM_ChangeMenu.lua
@@ -173,7 +173,7 @@ function me.UpdateChangeMenu(gearSlot)
       end
 
       local changeMenuSlot = changeMenuSlots[index]
-      mod.uiHelper.PrepareSlotTexture(changeMenuSlot)
+      mod.uiHelper.UpdateSlotTextureAttributes(changeMenuSlot)
 
       -- update metadata for slot
       changeMenuSlot.slotId = gearSlotMetaData.slotId

diff --git a/gui/GM_GearBar.lua b/gui/GM_GearBar.lua
@@ -139,7 +139,7 @@ function me.CreateGearSlot(gearBarFrame, position)
   gearSlot.position = position
 
   mod.uiHelper.CreateHighlightFrame(gearSlot)
-  mod.uiHelper.PrepareSlotTexture(gearSlot)
+  mod.uiHelper.UpdateSlotTextureAttributes(gearSlot)
   mod.uiHelper.CreateCooldownOverlay(
     gearSlot,
     RGGM_CONSTANTS.ELEMENT_GEAR_BAR_SLOT_COOLDOWN_FRAME,
@@ -288,6 +288,7 @@ function me.UpdateGearBar()
       gearSlot:SetAttribute("type1", "item")
       gearSlot:SetAttribute("item", gearSlotMetaData.slotId)
       me.UpdateTexture(gearSlot, gearSlotMetaData)
+      mod.uiHelper.UpdateSlotTextureAttributes(gearSlot)
       slotCount = slotCount + 1
       gearSlot:Show()
     else

diff --git a/gui/GM_UiHelper.lua b/gui/GM_UiHelper.lua
@@ -37,9 +37,12 @@ me.tag = "UiHelper"
 
   @param {table} slot
 ]]--
-function me.PrepareSlotTexture(slot)
-  -- set a dummy texture - otherwise GetNormalTexture will return nil
-  slot:SetNormalTexture("//dummy")
+function me.UpdateSlotTextureAttributes(slot)
+  if slot:GetNormalTexture() == nil then
+    -- set a dummy texture - otherwise GetNormalTexture will return nil
+    slot:SetNormalTexture("//dummy")
+  end
+
   local texture = slot:GetNormalTexture()
   texture:SetTexCoord(0.1, 0.9, 0.1, 0.9)
   texture:SetPoint(