Skip to content

Commit

Permalink
Framework update and small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tercioo committed Jul 6, 2021
1 parent 136fd22 commit 6823f59
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
10 changes: 6 additions & 4 deletions Libs/DF/fw.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


local dversion = 258
local dversion = 260

local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)
Expand Down Expand Up @@ -359,9 +359,11 @@ end
function DF.table.copytocompress (t1, t2)
for key, value in pairs (t2) do
if (key ~= "__index" and type(value) ~= "function") then
if (type (value) == "table") then
t1 [key] = t1 [key] or {}
DF.table.copytocompress (t1 [key], t2 [key])
if (type(value) == "table") then
if (not value.GetObjectType) then
t1 [key] = t1 [key] or {}
DF.table.copytocompress(t1 [key], t2 [key])
end
else
t1 [key] = value
end
Expand Down
13 changes: 6 additions & 7 deletions Libs/DF/panel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -742,8 +742,8 @@ local add_row = function (self, t, need_update)
local index = #self.rows+1

local thisrow = DF:NewPanel (self, self, "$parentHeader_" .. self._name .. index, nil, 1, 20)
thisrow.backdrop = {bgFile = [[Interface\DialogFrame\UI-DialogBox-Gold-Background]]}
thisrow.color = "silver"
thisrow.backdrop = {bgFile = [[Interface\Tooltips\UI-Tooltip-Background]]}
thisrow.color = {.3, .3, .3, .9}
thisrow.type = t.type
thisrow.func = t.func
thisrow.name = t.name
Expand Down Expand Up @@ -777,7 +777,7 @@ local align_rows = function (self)
end
end

local cur_width = 0
local cur_width = 1
local row_width = self._width / max (rows_shown, 0.0001)


Expand All @@ -793,11 +793,11 @@ local align_rows = function (self)
else
row.width = row_width
end
row:SetPoint ("topleft", self, "topleft", cur_width, 0)
row:SetPoint ("topleft", self, "topleft", cur_width, -1)
tinsert (self._anchors, cur_width)
cur_width = cur_width + row_width + 1
else
row:SetPoint ("topleft", self, "topleft", cur_width, 0)
row:SetPoint ("topleft", self, "topleft", cur_width, -1)
row.width = self._raw_rows [index].width
tinsert (self._anchors, cur_width)
cur_width = cur_width + self._raw_rows [index].width + 1
Expand Down Expand Up @@ -991,7 +991,6 @@ local update_rows = function (self, updated_rows)
widget.text:SetText (t.name)
DF:SetFontSize (widget.text, raw.textsize or 10)
widget.text:SetJustifyH (raw.textalign or "left")

end
end

Expand Down Expand Up @@ -6989,7 +6988,7 @@ end
]]

function DF:BuildStatusbarAuthorInfo (f, addonBy, authorsNameString)
local authorName = DF:CreateLabel (f, "" .. (addonBy or "An addon by") .. "|cFFFFFFFF" .. (authorsNameString or "Terciob") .. "|r")
local authorName = DF:CreateLabel (f, "" .. (addonBy or "An addon by ") .. "|cFFFFFFFF" .. (authorsNameString or "Terciob") .. "|r")
authorName.textcolor = "silver"
local discordLabel = DF:CreateLabel (f, "Discord: ")
discordLabel.textcolor = "silver"
Expand Down
7 changes: 4 additions & 3 deletions boot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

local version, build, date, tocversion = GetBuildInfo()

_detalhes.build_counter = 8698
_detalhes.alpha_build_counter = 8698 --if this is higher than the regular counter, use it instead
_detalhes.build_counter = 8700
_detalhes.alpha_build_counter = 8700 --if this is higher than the regular counter, use it instead
_detalhes.bcc_counter = 25
_detalhes.dont_open_news = true
_detalhes.game_version = version
Expand Down Expand Up @@ -196,8 +196,9 @@ do
--> current instances of the exp (need to maintain)
_detalhes.InstancesToStoreData = { --mapId
[2296] = true, --castle narnia
[2450] = true, --sanctum of domination
}

--> armazena os escudos - Shields information for absorbs
_detalhes.escudos = {}
--> armazena as fun��es dos frames - Frames functions
Expand Down

0 comments on commit 6823f59

Please sign in to comment.