- Changes for more differences between PTR and Beta
urnati [10-24-22 - 23:47]
- Changes for more differences between PTR and Beta
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 @@
<AbsDimension x="0" y="0"/>
</PushedTextOffset>
</Button>
- <Slider name="TitanOptionsSliderTemplate" orientation="VERTICAL" inherits="BackdropTemplate" virtual="true" enableMouse="true" EnableMouseWheel="true">
+ <Slider name="TitanOptionsSliderTemplate" orientation="VERTICAL" inherits="BackdropTemplate" virtual="true" enableMouse="true" >
<Size>
<AbsDimension x="10" y="100"/>
</Size>
@@ -135,8 +135,11 @@
</Size>
</ThumbTexture>
<Scripts>
+ <!-- DF Appears Blizz moved EnableMouseWheel from declaration to code -->
<OnLoad>
TitanOptionsSliderTemplate_OnLoad(self);
+
+ self:EnableMouseWheel(true);
</OnLoad>
</Scripts> </Slider>
</Ui>
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