Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nameplates: move clickhandler to health #1368

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nameplates: move clickhandler to health #1368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions modules/nameplates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,13 +1041,19 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
-- replace clickhandler
if C.nameplates["overlap"] == "1" or C.nameplates["vertical_offset"] ~= "0" then
parent:SetFrameLevel(0)
nameplate:SetScript("OnClick", function() parent:Click() end)
nameplate.health:SetScript("OnMouseDown", function()
if arg1 == "RightButton" and C.nameplates["rightclick"] == "1" then
nameplates.mouselook.OnMouseDown()
else
parent:Click(arg1)
end
end)

parent:EnableMouse(false)
nameplate:EnableMouse(true)
nameplate.health:EnableMouse(true)
else
parent:EnableMouse(true)
nameplate:EnableMouse(false)
nameplate.health:EnableMouse(false)
end

-- enable mouselook on rightbutton down
Expand All @@ -1059,10 +1065,8 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()

-- disable click event on frames
if C.nameplates["clickthrough"] == "1" then
nameplate:EnableMouse(false)
nameplate.health:EnableMouse(false)
plate:EnableMouse(false)
else
plate:EnableMouse(true)
end
end

Expand All @@ -1088,9 +1092,9 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
end

-- disable click events while spell is targeting
local mouseEnabled = this.nameplate:IsMouseEnabled()
local mouseEnabled = this.nameplate.health:IsMouseEnabled()
if C.nameplates["clickthrough"] == "0" and C.nameplates["overlap"] == "1" and SpellIsTargeting() == mouseEnabled then
this.nameplate:EnableMouse(not mouseEnabled)
this.nameplate.health:EnableMouse(not mouseEnabled)
end

hookOnUpdate(self)
Expand Down Expand Up @@ -1126,7 +1130,11 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()

-- run a usual nameplate rightclick action
if not IsMouselooking() then
this.frame:Click("LeftButton")
if this.frame:GetObjectType() == "Button" then
this.frame:Click("LeftButton")
else
this.frame:GetParent():GetParent():Click("LeftButton")
end
if UnitCanAttack("player", "target") and not nameplates.combat.inCombat then AttackTarget() end
this:Hide()
return
Expand Down