From 8719afc44c2879b56d0258ee975fbad3dc9b6523 Mon Sep 17 00:00:00 2001 From: urnati Date: Mon, 24 Oct 2022 19:47:41 -0400 Subject: [PATCH] - Changes for more differences between PTR and Beta --- Titan/LDBToTitan.lua | 9 +++++++-- Titan/TitanPanelTemplate.xml | 5 ++++- TitanRepair/TitanRepair.lua | 9 ++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Titan/LDBToTitan.lua b/Titan/LDBToTitan.lua index ee7989c..4d55188 100644 --- a/Titan/LDBToTitan.lua +++ b/Titan/LDBToTitan.lua @@ -768,10 +768,15 @@ function LDBToTitan:TitanLDBCreateObject(_, name, obj) if obj.type == "macro" then -- custom newTitanFrame = CreateFrame("Button", "TitanPanel"..NAME_PREFIX..name.."Button", - UIParent, "TitanPanelComboTemplate, InsecureActionButtonTemplate") + UIParent, "TitanPanelComboTemplate, SecureActionButtonTemplate") newTitanFrame:SetAttribute("type", "macro") newTitanFrame:SetAttribute("macrotext", obj.commandtext) - +--[[ +print("T_LDB" +.." "..tostring(name).." " +.." '"..tostring(obj.commandtext).."' " +) +--]] else newTitanFrame = CreateFrame("Button", "TitanPanel"..NAME_PREFIX..name.."Button", diff --git a/Titan/TitanPanelTemplate.xml b/Titan/TitanPanelTemplate.xml index ab7d849..611b11e 100644 --- a/Titan/TitanPanelTemplate.xml +++ b/Titan/TitanPanelTemplate.xml @@ -91,7 +91,7 @@ - + @@ -135,8 +135,11 @@ + TitanOptionsSliderTemplate_OnLoad(self); + + self:EnableMouseWheel(true); diff --git a/TitanRepair/TitanRepair.lua b/TitanRepair/TitanRepair.lua index 55b10d9..3be0e28 100644 --- a/TitanRepair/TitanRepair.lua +++ b/TitanRepair/TitanRepair.lua @@ -475,7 +475,14 @@ function TitanRepair_GetInventoryInformation(bag) -- DF -- for slot = 1, GetContainerNumSlots(bag) do - for slot = 1, ContainerFrame_GetContainerNumSlotsWithBase(bag) do + local get_slots = nil + if C_Container.GetContainerNumSlots then + get_slots = C_Container.GetContainerNumSlots + elseif GetContainerNumSlots then + get_slots = GetContainerNumSlots + end + + for slot = 1, get_slots(bag) do -- retrieve item repair status of this slot in the bag local act_status, act_val, act_max, act_cost = TitanRepair_GetStatus(slot, bag); if act_max ~= 0 then -- 1.7.9.5