Skip to content

Commit

Permalink
Merge pull request #40 from GovtGeek/patch-4.4.1
Browse files Browse the repository at this point in the history
Patch 4.4.1
  • Loading branch information
GovtGeek authored Oct 30, 2024
2 parents 6ab3a1a + 02240c9 commit 77850d9
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 16 deletions.
22 changes: 17 additions & 5 deletions Libraries/LibDropdown-1.0.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ local wipe = wipe
local CreateFrame = CreateFrame
local PlaySound = PlaySound
local ShowUIPanel = ShowUIPanel
local GetMouseFocus = GetMouseFocus
--local GetMouseFocus = GetMouseFocus
local UISpecialFrames = UISpecialFrames

local ChatFrame1 = ChatFrame1
Expand Down Expand Up @@ -212,10 +212,22 @@ local function ReleaseInput(input)
end

local function MouseOver(frame)
local f = GetMouseFocus()
while f and f ~= UIParent do
if f == frame then return true end
f = f:GetParent()
if _G["GetMouseFocus"] then
local f = GetMouseFocus()
while f and f ~= UIParent do
if f == frame then return true end
f = f:GetParent()
end
else
local mouseFoci = GetMouseFoci()
for _, f in ipairs(mouseFoci) do
while f do
if f == frame then
return true
end
f = f:GetParent()
end
end
end
return false
end
Expand Down
4 changes: 2 additions & 2 deletions Outfitter.toc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
## Interface: 40400, 30403, 20504, 11503
## Interface: 40401, 30403, 20504, 11504

## Author: GovtGeek
## X-Original-Author: John Stephen
## X-Credits: Mundocani, Miv, Gogo, LemonDrake
## Title: Outfitter
## Version: 4.4.0.5
## Version: 4.4.1
## Notes: Clothing and weapon management and automated equipment changes
## OptionalDeps:
## RequiredDeps:
Expand Down
16 changes: 8 additions & 8 deletions Outfitter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</Scripts>
</Button>

<CheckButton name="OutfitterCheckboxTemplate" inherits="OptionsCheckButtonTemplate" virtual="true">
<CheckButton name="OutfitterCheckboxTemplate" inherits="UICheckButtonTemplate" virtual="true">
<Scripts>
<OnClick>
if self:GetChecked() then
Expand Down Expand Up @@ -843,7 +843,7 @@
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="15" y="-90"/>
<AbsDimension x="15" y="-70"/>
</Offset>
</Anchor>
</Anchors>
Expand All @@ -870,7 +870,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="OutfitterAutoSwitch" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="0" y="-10"/>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
Expand All @@ -895,7 +895,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="OutfitterShowOutfitBar" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="0" y="-5"/>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
Expand All @@ -922,7 +922,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="OutfitterShowMinimapButton" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="0" y="-5"/>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
Expand All @@ -949,7 +949,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="OutfitterShowHotkeyMessages" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="0" y="-5"/>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
Expand All @@ -976,7 +976,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="OutfitterTooltipInfo" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="0" y="-5"/>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
Expand All @@ -1003,7 +1003,7 @@
<Anchors>
<Anchor point="TOPLEFT" relativeTo="OutfitterItemComparisons" relativePoint="BOTTOMLEFT">
<Offset>
<AbsDimension x="0" y="-10"/>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
Expand Down
2 changes: 1 addition & 1 deletion Outfitter_Vanilla.toc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 11503
## Interface: 11504
## Author: GovtGeek
## X-Original-Author: John Stephen
## X-Credits: Mundocani, Miv, Gogo, LemonDrake
Expand Down

0 comments on commit 77850d9

Please sign in to comment.