From 1cd17f84c6907894ea602c073b2d4a24a08664d0 Mon Sep 17 00:00:00 2001 From: WildCard_25 Date: Mon, 18 Mar 2019 03:41:17 +1100 Subject: [PATCH] Change armor pLevel/weapon pLevel/xp placement so they are always inside the button they belong to. This may conflict with Master Plan's placement of the same, but as these can be turned off in either addon, this shouldn't be a problem --- GarrisonCommander.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/GarrisonCommander.lua b/GarrisonCommander.lua index c02b712..46bf130 100644 --- a/GarrisonCommander.lua +++ b/GarrisonCommander.lua @@ -1296,10 +1296,11 @@ end function addon:RenderFollowerPageFollowerButton(frame,follower,showCounters) if not frame.GCWep then frame.GCWep=frame:CreateFontString(nil,"ARTWORK","GameFontHighlightSmall") - frame.GCWep:SetPoint("BOTTOMLEFT",frame.Name,"TOPLEFT",0,2) + frame.GCWep:SetPoint("LEFT",frame.ILevel,"RIGHT",5,0) frame.GCArm=frame:CreateFontString(nil,"ARTWORK","GameFontHighlightSmall") - frame.GCArm:SetPoint("TOPLEFT",frame.GCWep,"TOPRIGHT") + frame.GCArm:SetPoint("LEFT",frame.GCWep,"RIGHT",5,0) frame.GCXp=frame:CreateFontString(nil,"ARTWORK","GameFontHighlightSmall") + frame.GCXp:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-5,5) end if not follower.isCollected or type(follower.followerID)=="number" or follower.isTroop then frame.GCXp:Hide() @@ -1326,16 +1327,13 @@ function addon:RenderFollowerPageFollowerButton(frame,follower,showCounters) frame.GCArm:SetTextColor(c2.r,c2.g,c2.b) frame.GCWep:Show() frame.GCArm:Show() - frame.GCXp:SetPoint("LEFT",frame.GCArm,"RIGHT",2,0) else frame.GCWep:Hide() frame.GCArm:Hide() - frame.GCXp:SetPoint("LEFT",frame.Name,"LEFT",0,20) end else frame.GCWep:Hide() frame.GCArm:Hide() - frame.GCXp:SetPoint("LEFT",frame.Name,"LEFT",0,20) end end function addon:HookedGarrisonFollowerListButton_OnClick(frame,button) -- 1.7.9.5