Skip to content

Commit

Permalink
adjustable debuff size
Browse files Browse the repository at this point in the history
  • Loading branch information
@d87
d87 committed Jul 19, 2019
1 parent 804dacb commit 5851ce4
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 44 deletions.
3 changes: 2 additions & 1 deletion Aptechka.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ local defaults = {
healerMediumRaid = 1,
healerBigRaid = 0.8,
},
debuffSize = 13,
nameFontName = "ClearFont",
nameFontSize = 12,
stackFontSize = 12,
Expand Down Expand Up @@ -2005,7 +2006,7 @@ function Aptechka.TestDebuffSlots()
local isBossAura = shown < numBossAuras
fill = fill + (isBossAura and 1.5 or 1)

print(fill, debuffLineLength, fill < debuffLineLength)
-- print(fill, debuffLineLength, fill < debuffLineLength)

if fill <= debuffLineLength then
shown = shown + 1
Expand Down
24 changes: 22 additions & 2 deletions Options/AptechkaOptions.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1153,9 +1153,9 @@ local function MakeGeneralOptions()
type = "select",
name = "Font",
order = 14.1,
get = function(info) return Aptechka.db.nameFont end,
get = function(info) return Aptechka.db.nameFontName end,
set = function(info, value)
Aptechka.db.nameFont = value
Aptechka.db.nameFontName = value
Aptechka:ReconfigureUnprotected()
end,
values = LSM:HashTable("font"),
Expand Down Expand Up @@ -1186,6 +1186,26 @@ local function MakeGeneralOptions()
max = 30,
step = 0.1,
order = 14.2,
},

debuffSize = {
name = "Debuff Size",
type = "range",
get = function(info) return Aptechka.db.debuffSize end,
set = function(info, v)
Aptechka.db.debuffSize = v
Aptechka:ReconfigureUnprotected()
end,
min = 5,
max = 30,
step = 0.1,
order = 14.3,
},
debuffTest = {
name = "Test Debuffs",
type = "execute",
func = function() Aptechka.TestDebuffSlots() end,
order = 14.4
},

inverted = {
Expand Down
97 changes: 56 additions & 41 deletions frame.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ local CreateIcon = function(parent,w,h,alpha,point,frame,to,x,y)
stackframe:SetFrameLevel(7)

stacktext:SetJustifyH"RIGHT"
stacktext:SetPoint("BOTTOMRIGHT",icon,"BOTTOMRIGHT",0,-1)
stacktext:SetPoint("BOTTOMRIGHT",icontex,"BOTTOMRIGHT", 3,-1)
stacktext:SetTextColor(1,1,1)
icon.stacktext = stacktext
icon.SetJob = SetJob_Icon
Expand Down Expand Up @@ -593,42 +593,55 @@ local function SetJob_DebuffIcon(self, job)
end
end

local SetDebuffOrientation = function(self, orientation)
local SetDebuffOrientation = function(self, orientation, size)
local it = self.texture
local dtt = self.debuffTypeTexture
local w = self.width
local h = self.height
-- local w = self.width
-- local h = self.height
local w = size
local h = size
local p = pixelperfect(1)
it:ClearAllPoints()
dtt:ClearAllPoints()

if orientation == "VERTICAL" then
self:SetSize(w,h)
it:SetSize(h,h)
it:SetPoint("TOPLEFT", self, "TOPLEFT", 0, 0)
dtt:SetSize(6,h)
dtt:SetPoint("TOPRIGHT", self, "TOPRIGHT", 0, 0)
-- dtt:SetSize(h+2,h+2)
-- dtt:SetPoint("TOPLEFT", self, "TOPLEFT", -1, 1)
else
self:SetSize(h,w)
it:SetSize(h,h)
it:SetPoint("BOTTOMLEFT", self, "BOTTOMLEFT", 0, 0)
-- dtt:SetSize(h,6)
-- dtt:SetPoint("TOPLEFT", self, "TOPLEFT", 0, 0)

dtt:SetSize(h+p*2,h+p*2)
dtt:SetPoint("CENTER", it, "CENTER", 0, 0)
end
-- local simple = false

-- if simple then
-- it:SetSize(pixelperfect(h - 2), pixelperfect(h - 2*p))
-- it:SetPoint("TOPLEFT", self, "TOPLEFT", p, -p)
-- dtt:SetSize(h, h)
-- dtt:SetPoint("TOPLEFT", self, "TOPLEFT", 0, 0)
-- else
if orientation == "VERTICAL" then
self:SetSize(w,h)
it:SetSize(h,h)
it:SetPoint("TOPLEFT", self, "TOPLEFT", 0, 0)
dtt:SetSize(h*0.2,h)
dtt:SetPoint("TOPLEFT", it, "TOPRIGHT", 0, 0)
-- dtt:SetSize(h+2,h+2)
-- dtt:SetPoint("TOPLEFT", self, "TOPLEFT", -1, 1)
else
self:SetSize(h,w)

-- dtt:SetSize(h,h*0.2)
-- dtt:SetPoint("BOTTOMLEFT", it, "TOPLEFT", 0, 0)

dtt:SetSize(w,h*0.2)
dtt:SetPoint("BOTTOMLEFT", self, "BOTTOMLEFT", 0, 0)
-- dtt:SetPoint("TOPLEFT", it, "TOPLEFT", 0, h*0.2)
-- dtt:SetPoint("BOTTOMRIGHT", it, "BOTTOMRIGHT", 0, 0)

it:SetSize(h,h)
it:SetPoint("BOTTOMLEFT", dtt, "TOPLEFT", 0, 0)
end
-- end
end

local CreateDebuffIcon = function(parent, width, height, alpha, point, frame, to, x, y)
local icon = CreateIcon(parent, width, height, alpha, point, frame, to, x, y)

local w = pixelperfect(width)
local h = pixelperfect(height)
icon.width = w
icon.height = h

local icontex = icon.texture
icontex:SetTexCoord(.2, .8, .2, .8)
Expand All @@ -639,7 +652,7 @@ local CreateDebuffIcon = function(parent, width, height, alpha, point, frame, to

icon.SetOrientation = SetDebuffOrientation

icon:SetOrientation("VERTICAL")
icon:SetOrientation("VERTICAL", w)

-- icon:SetBackdrop{
-- bgFile = "Interface\\BUTTONS\\WHITE8X8", tile = true, tileSize = 0,
Expand Down Expand Up @@ -991,10 +1004,11 @@ local function Reconf(self)
self.dicon2:SetPoint("BOTTOMLEFT", self.dicon1, "TOPLEFT",0,0)
self.dicon3:SetPoint("BOTTOMLEFT", self.dicon2, "TOPLEFT",0,0)
self.dicon4:SetPoint("BOTTOMLEFT", self.dicon3, "TOPLEFT",0,0)
self.dicon1:SetOrientation("VERTICAL")
self.dicon2:SetOrientation("VERTICAL")
self.dicon3:SetOrientation("VERTICAL")
self.dicon4:SetOrientation("VERTICAL")
local debuffSize = pixelperfect(Aptechka.db.debuffSize)
self.dicon1:SetOrientation("VERTICAL", debuffSize)
self.dicon2:SetOrientation("VERTICAL", debuffSize)
self.dicon3:SetOrientation("VERTICAL", debuffSize)
self.dicon4:SetOrientation("VERTICAL", debuffSize)

else
self.health:SetOrientation("HORIZONTAL")
Expand All @@ -1021,13 +1035,14 @@ local function Reconf(self)
self.power:SetPoint("BOTTOMLEFT",self,"BOTTOMLEFT",0,0)

self.dicon1:SetPoint("BOTTOMLEFT", self.power, "TOPLEFT",0,0)
self.dicon2:SetPoint("BOTTOMLEFT", self.dicon1, "BOTTOMRIGHT",2,0)
self.dicon3:SetPoint("BOTTOMLEFT", self.dicon2, "BOTTOMRIGHT",2,0)
self.dicon4:SetPoint("BOTTOMLEFT", self.dicon3, "BOTTOMRIGHT",2,0)
self.dicon1:SetOrientation("HORIZONTAL")
self.dicon2:SetOrientation("HORIZONTAL")
self.dicon3:SetOrientation("HORIZONTAL")
self.dicon4:SetOrientation("HORIZONTAL")
self.dicon2:SetPoint("BOTTOMLEFT", self.dicon1, "BOTTOMRIGHT", 0, 0)
self.dicon3:SetPoint("BOTTOMLEFT", self.dicon2, "BOTTOMRIGHT", 0, 0)
self.dicon4:SetPoint("BOTTOMLEFT", self.dicon3, "BOTTOMRIGHT", 0, 0)
local debuffSize = pixelperfect(Aptechka.db.debuffSize)
self.dicon1:SetOrientation("HORIZONTAL", debuffSize)
self.dicon2:SetOrientation("HORIZONTAL", debuffSize)
self.dicon3:SetOrientation("HORIZONTAL", debuffSize)
self.dicon4:SetOrientation("HORIZONTAL", debuffSize)
end

end
Expand Down Expand Up @@ -1413,11 +1428,11 @@ AptechkaDefaultConfig.GridSkin = function(self)
-- local bar3 = CreateStatusBar(self, 21, 4, "TOPRIGHT", self, "TOPRIGHT",0,1)
-- local vbar1 = CreateStatusBar(self, 4, 19, "TOPRIGHT", self, "TOPRIGHT",-9,2, nil, true)


self.dicon1 = CreateDebuffIcon(self, 16, 13, 1, "BOTTOMLEFT", self, "BOTTOMLEFT",0,0)
self.dicon2 = CreateDebuffIcon(self, 16, 13, 1, "BOTTOMLEFT", self.dicon1, "TOPLEFT",0,0)
self.dicon3 = CreateDebuffIcon(self, 16, 13, 1, "BOTTOMLEFT", self.dicon2, "TOPLEFT",0,0)
self.dicon4 = CreateDebuffIcon(self, 16, 13, 1, "BOTTOMLEFT", self.dicon3, "TOPLEFT",0,0)
local debuffSize = Aptechka.db.debuffSize
self.dicon1 = CreateDebuffIcon(self, debuffSize, debuffSize, 1, "BOTTOMLEFT", self, "BOTTOMLEFT",0,0)
self.dicon2 = CreateDebuffIcon(self, debuffSize, debuffSize, 1, "BOTTOMLEFT", self.dicon1, "TOPLEFT",0,0)
self.dicon3 = CreateDebuffIcon(self, debuffSize, debuffSize, 1, "BOTTOMLEFT", self.dicon2, "TOPLEFT",0,0)
self.dicon4 = CreateDebuffIcon(self, debuffSize, debuffSize, 1, "BOTTOMLEFT", self.dicon3, "TOPLEFT",0,0)

-- local brcorner = CreateCorner(self, 21, 21, "BOTTOMRIGHT", self, "BOTTOMRIGHT",0,0)
local blcorner = CreateCorner(self, 12, 12, "BOTTOMLEFT", self.dicon1, "BOTTOMRIGHT",0,0, "BOTTOMLEFT") --last arg changes orientation
Expand Down

0 comments on commit 5851ce4

Please sign in to comment.