Skip to content

Commit

Permalink
10.0.0 fixes
Browse files Browse the repository at this point in the history
- Fix Backdrop related XML errors
- Fix HorizontalSliderTemplate -> UISliderTemplate
- Wrap LFG panel in a nil check for now
- Fix progress bar getting stuck
  • Loading branch information
filliph committed Oct 28, 2022
1 parent 9dab491 commit 7e5cf43
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
</Layer>
</Layers>
<Frames>
<Slider parentKey="Slider" inherits="HorizontalSliderTemplate">
<Slider parentKey="Slider" inherits="UISliderTemplate">
<Size y="17"/>
<Anchors>
<Anchor point="BOTTOMLEFT" x="30" y="5"/>
Expand Down
26 changes: 14 additions & 12 deletions Templates.xml
Original file line number Diff line number Diff line change
Expand Up @@ -215,19 +215,21 @@
</Scripts>
</Button>

<Frame name="WQT_ContainerTemplate" virtual="true">
<Frame name="WQT_ContainerTemplate" virtual="true" inherits="BackdropTemplate">
<Size x="296.5" y="518"/>
<Backdrop edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
<EdgeSize>
<AbsValue val="12"/>
</EdgeSize>
<TileSize>
<AbsValue val="16"/>
</TileSize>
<BackgroundInsets>
<AbsInset left="0" right="0" top="5" bottom="5"/>
</BackgroundInsets>
</Backdrop>
<Scripts>
<OnLoad>
self:SetBackdrop({
edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
tile = true,
tileEdge = true,
edgeSize = 12,
tileSize = 16,
insets = { left = 0, right = 0, top = 5, bottom = 5 },
});
self:ApplyBackdrop();
</OnLoad>
</Scripts>
<Frames>
<Frame parentKey="Inset" inherits="ShadowOverlaySmallTemplate">
<Anchors>
Expand Down
13 changes: 8 additions & 5 deletions WorldQuestTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2074,12 +2074,13 @@ function WQT_CoreMixin:OnLoad()
WQT_WorldQuestFrame:TriggerCallback("QuestsLoaded")
end, addonName)

self.dataProvider:RegisterCallback("BufferUpdated", function(progress)
if (progress == 0) then
self.dataProvider:RegisterCallback("BufferUpdated", function(progress)
if (progress == 0 or progress == 1) then
self.ProgressBar:Hide();
else
CooldownFrame_SetDisplayAsPercentage(self.ProgressBar, progress);
self.ProgressBar.Pointer:SetRotation(-progress*6.2831);
end
CooldownFrame_SetDisplayAsPercentage(self.ProgressBar, progress);
self.ProgressBar.Pointer:SetRotation(-progress*6.2831);
end, addonName)

-- Events
Expand Down Expand Up @@ -2298,7 +2299,8 @@ function WQT_CoreMixin:OnLoad()
end);

local LFGParent = LFGListSearchPanelScrollFrameScrollChild;
LFGParent.StartGroupButton:HookScript("OnClick", function()
if LFGParent ~= nil then
LFGParent.StartGroupButton:HookScript("OnClick", function()
-- If we are creating a group because we couldn't find one, show the info on the create frame
if InCombatLockdown() then return; end
local searchString = LFGListFrame.SearchPanel.SearchBox:GetText();
Expand All @@ -2317,6 +2319,7 @@ function WQT_CoreMixin:OnLoad()
WQT_GroupSearch:Show();
end
end)
end

-- Hook hiding of official pins if we replace them with our own
local mapWQProvider = WQT_Utils:GetMapWQProvider();
Expand Down
11 changes: 6 additions & 5 deletions WorldQuestTab.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,12 @@
<Size x="28" y="29" />
<Layers>
<Layer level="BACKGROUND">
<Texture parentKey="Icon" file="Interface\ICONS\INV_Misc_QuestionMark"/>
<Anchors>
<Anchor point="TOPLEFT" x="1" y="-1"/>
<Anchor point="BOTTOMRIGHT" x="-1" y="1"/>
</Anchors>
<Texture parentKey="Icon" file="Interface\ICONS\INV_Misc_QuestionMark">
<Anchors>
<Anchor point="TOPLEFT" x="1" y="-1"/>
<Anchor point="BOTTOMRIGHT" x="-1" y="1"/>
</Anchors>
</Texture>
</Layer>
<Layer level="ARTWORK">
<FontString parentKey="Amount" inherits="WQT_NumberFontOutline" maxLines="1" justifyH="RIGHT">
Expand Down

0 comments on commit 7e5cf43

Please sign in to comment.