Format the text in the breakdown player list using the same font, size and outline of the damage window
This commit is contained in:
+41
-44
@@ -1,11 +1,10 @@
|
||||
local Details = _G.Details
|
||||
local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" )
|
||||
|
||||
local g = Details.gump
|
||||
local Details = _G.Details
|
||||
local Loc = LibStub("AceLocale-3.0"):GetLocale( "Details" )
|
||||
local gump = Details.gump
|
||||
local _
|
||||
|
||||
function Details:OpenNewsWindow(textToShow, dumpValues, keeptext)
|
||||
|
||||
Details.latest_news_saw = Details.userversion
|
||||
|
||||
local newsFrame = Details:CreateOrOpenNewsWindow()
|
||||
@@ -15,30 +14,30 @@ function Details:OpenNewsWindow(textToShow, dumpValues, keeptext)
|
||||
newsFrame:Show()
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
if (textToShow and type (textToShow) == "table") then
|
||||
DetailsNewsWindowLower:SetSize (450, 5000)
|
||||
DetailsNewsWindowSlider:SetMinMaxValues (0, 5000)
|
||||
DetailsNewsWindowText:SetHeight (5000)
|
||||
|
||||
local s = ""
|
||||
for _, text in ipairs (textToShow) do
|
||||
if (type (text) == "string" or type (text) == "number") then
|
||||
s = s .. text .. "\n"
|
||||
DetailsNewsWindowLower:SetSize(450, 5000)
|
||||
DetailsNewsWindowSlider:SetMinMaxValues(0, 5000)
|
||||
DetailsNewsWindowText:SetHeight(5000)
|
||||
|
||||
local returnString = ""
|
||||
for _, text in ipairs(textToShow) do
|
||||
if (type(text) == "string" or type(text) == "number") then
|
||||
returnString = returnString .. text .. "\n"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if (dumpValues) then
|
||||
s = Details.table.dump (textToShow)
|
||||
returnString = Details.table.dump(textToShow)
|
||||
end
|
||||
|
||||
|
||||
if (keeptext) then
|
||||
newsFrame:Text ((DetailsNewsWindowText:GetText() or "") .. "\n\n" .. s)
|
||||
newsFrame:Text((DetailsNewsWindowText:GetText() or "") .. "\n\n" .. returnString)
|
||||
else
|
||||
if (dumpValues) then
|
||||
newsFrame.DumpTableFrame:SetText (s)
|
||||
newsFrame.DumpTableFrame:SetText (returnString)
|
||||
else
|
||||
newsFrame:Text (s)
|
||||
newsFrame:Text (returnString)
|
||||
end
|
||||
end
|
||||
else
|
||||
@@ -62,10 +61,8 @@ end
|
||||
|
||||
function Details:CreateOrOpenNewsWindow()
|
||||
local frame = _G.DetailsNewsWindow
|
||||
|
||||
if (not frame) then
|
||||
--build news frame
|
||||
|
||||
if (not frame) then
|
||||
frame = DetailsFramework:CreateSimplePanel(UIParent, 480, 560, "Details! Damage Meter " .. Details.version, "DetailsNewsWindow", panel_options, db)
|
||||
tinsert(UISpecialFrames, "DetailsNewsWindow")
|
||||
frame:SetPoint("left", UIParent, "left", 10, 0)
|
||||
@@ -83,30 +80,30 @@ function Details:CreateOrOpenNewsWindow()
|
||||
frame.imageFrame.texture = frame.imageFrame:CreateTexture(nil, "overlay")
|
||||
frame.imageFrame.texture:SetPoint("topleft", frame.imageFrame, "topleft")
|
||||
|
||||
local dumpFrame = g:CreateTextEntry(frame, function()end, 500, 612, "DumpTable", "$parentDumpTable")
|
||||
dumpFrame.editbox:SetMultiLine (true)
|
||||
|
||||
local dumpFrame = gump:CreateTextEntry(frame, function()end, 500, 612, "DumpTable", "$parentDumpTable")
|
||||
dumpFrame.editbox:SetMultiLine(true)
|
||||
|
||||
dumpFrame:SetPoint("topleft", frame, "topleft", 8, -68)
|
||||
dumpFrame:SetBackdrop(nil)
|
||||
dumpFrame.editbox:SetBackdrop(nil)
|
||||
dumpFrame.editbox:SetJustifyH("left")
|
||||
dumpFrame.editbox:SetJustifyV("top")
|
||||
|
||||
frame.DumpTableFrame = dumpFrame
|
||||
|
||||
local frame_upper = CreateFrame("scrollframe", nil, frame, "BackdropTemplate")
|
||||
local frame_lower = CreateFrame("frame", "DetailsNewsWindowLower", frame_upper, "BackdropTemplate")
|
||||
|
||||
frame_lower:SetSize (450, 2000)
|
||||
frame_upper:SetPoint ("topleft", frame, "topleft", 10, -30)
|
||||
frame_upper:SetWidth(445)
|
||||
frame_upper:SetHeight(500)
|
||||
frame_upper:SetBackdrop({
|
||||
frame.DumpTableFrame = dumpFrame
|
||||
|
||||
local frameUpper = CreateFrame("scrollframe", nil, frame, "BackdropTemplate")
|
||||
local frameLower = CreateFrame("frame", "DetailsNewsWindowLower", frameUpper, "BackdropTemplate")
|
||||
|
||||
frameLower:SetSize (450, 2000)
|
||||
frameUpper:SetPoint ("topleft", frame, "topleft", 10, -30)
|
||||
frameUpper:SetWidth(445)
|
||||
frameUpper:SetHeight(500)
|
||||
frameUpper:SetBackdrop({
|
||||
bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
|
||||
tile = true, tileSize = 16,
|
||||
insets = {left = 1, right = 1, top = 0, bottom = 1},})
|
||||
frame_upper:SetBackdropColor (.1, .1, .1, .3)
|
||||
frame_upper:SetScrollChild (frame_lower)
|
||||
frameUpper:SetBackdropColor (.1, .1, .1, .3)
|
||||
frameUpper:SetScrollChild (frameLower)
|
||||
|
||||
local slider = CreateFrame ("slider", "DetailsNewsWindowSlider", frame, "BackdropTemplate")
|
||||
slider.bg = slider:CreateTexture (nil, "background")
|
||||
@@ -120,15 +117,15 @@ function Details:CreateOrOpenNewsWindow()
|
||||
slider:SetThumbTexture (slider.thumb)
|
||||
slider:SetOrientation ("vertical");
|
||||
slider:SetSize (16, 499)
|
||||
slider:SetPoint ("topleft", frame_upper, "topright")
|
||||
slider:SetPoint ("topleft", frameUpper, "topright")
|
||||
slider:SetMinMaxValues (0, 2000)
|
||||
slider:SetValue(0)
|
||||
slider:SetScript("OnValueChanged", function (self)
|
||||
frame_upper:SetVerticalScroll (self:GetValue())
|
||||
slider:SetScript("OnValueChanged", function(self)
|
||||
frameUpper:SetVerticalScroll (self:GetValue())
|
||||
end)
|
||||
|
||||
frame_upper:EnableMouseWheel (true)
|
||||
frame_upper:SetScript("OnMouseWheel", function (self, delta)
|
||||
frameUpper:EnableMouseWheel (true)
|
||||
frameUpper:SetScript("OnMouseWheel", function(self, delta)
|
||||
local current = slider:GetValue()
|
||||
if (IsShiftKeyDown() and (delta > 0)) then
|
||||
slider:SetValue(0)
|
||||
@@ -142,8 +139,8 @@ function Details:CreateOrOpenNewsWindow()
|
||||
end)
|
||||
|
||||
--> text box
|
||||
local texto = frame_lower:CreateFontString("DetailsNewsWindowText", "overlay", "GameFontNormal")
|
||||
texto:SetPoint("topleft", frame_lower, "topleft")
|
||||
local texto = frameLower:CreateFontString("DetailsNewsWindowText", "overlay", "GameFontNormal")
|
||||
texto:SetPoint("topleft", frameLower, "topleft")
|
||||
texto:SetJustifyH("left")
|
||||
texto:SetJustifyV("top")
|
||||
texto:SetTextColor(1, 1, 1)
|
||||
|
||||
Reference in New Issue
Block a user