- this is part of ToS June 20th update.
- New Death Recap implemented! replaces the default from Blizzard and can be configured at Options > Raid Tools. - New Guild Damage and Heal rank on '/details ranking' panel. - Added a Guild Sync button on the Details! Ranking Panel. - Added Custom display 'Damage on Shields', useful for encounter like Maiden of Vigilance where there's big shields to be removed and you want to know who is doing more damage to it. - Added Heal Absorbed display under Heal bracket.\n\nHeal Absorb are the heal denied by abilities such like DK's Necrotic Strike or raid boss Sisters of the Moon 'Embrace of the Eclipse' ability.\nThe tooltip of this display shows which players got heal denied, which abilities absorbed the heal, which abilities tried to heal but got the heal denied. - Added Alternate Power display under Energy bracket, it shows the total of alternate power gain from each player, useful for encounters such as Demonic Inquisition. - Fixed Paladin 'Light of the Martyr' damage to self.
This commit is contained in:
Tercio
+10
-2
@@ -394,7 +394,7 @@ local ButtonMetaFunctions = _G [DF.GlobalWidgetControlNames ["button"]]
|
||||
end
|
||||
|
||||
-- icon
|
||||
function ButtonMetaFunctions:SetIcon (texture, width, height, layout, texcoord, overlay, textdistance, leftpadding, textheight)
|
||||
function ButtonMetaFunctions:SetIcon (texture, width, height, layout, texcoord, overlay, textdistance, leftpadding, textheight, short_method)
|
||||
if (not self.icon) then
|
||||
self.icon = self:CreateTexture (nil, "artwork")
|
||||
self.icon:SetSize (self.height*0.8, self.height*0.8)
|
||||
@@ -427,9 +427,13 @@ local ButtonMetaFunctions = _G [DF.GlobalWidgetControlNames ["button"]]
|
||||
local iconw = self.icon:GetWidth()
|
||||
local text_width = self.button.text:GetStringWidth()
|
||||
if (text_width > w-15-iconw) then
|
||||
if (not short_method) then
|
||||
|
||||
if (short_method == false) then
|
||||
|
||||
elseif (not short_method) then
|
||||
local new_width = text_width+15+iconw
|
||||
self.button:SetWidth (new_width)
|
||||
|
||||
elseif (short_method == 1) then
|
||||
local loop = true
|
||||
local textsize = 11
|
||||
@@ -443,6 +447,7 @@ local ButtonMetaFunctions = _G [DF.GlobalWidgetControlNames ["button"]]
|
||||
textsize = textsize - 1
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1015,6 +1020,9 @@ function DF:NewButton (parent, container, name, member, w, h, func, param1, para
|
||||
textsize = textsize - 1
|
||||
end
|
||||
end
|
||||
|
||||
elseif (short_method == 2) then
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
+35
-3
@@ -1,5 +1,5 @@
|
||||
|
||||
local dversion = 50
|
||||
local dversion = 52
|
||||
local major, minor = "DetailsFramework-1.0", dversion
|
||||
local DF, oldminor = LibStub:NewLibrary (major, minor)
|
||||
|
||||
@@ -304,10 +304,18 @@ function DF:GetFontFace (fontString)
|
||||
return fontface
|
||||
end
|
||||
|
||||
local ValidOutlines = {
|
||||
["NONE"] = true,
|
||||
["MONOCHROME"] = true,
|
||||
["OUTLINE"] = true,
|
||||
["THICKOUTLINE"] = true,
|
||||
}
|
||||
function DF:SetFontOutline (fontString, outline)
|
||||
local fonte, size = fontString:GetFont()
|
||||
if (outline) then
|
||||
if (_type (outline) == "boolean" and outline) then
|
||||
if (ValidOutlines [outline]) then
|
||||
outline = outline
|
||||
elseif (_type (outline) == "boolean" and outline) then
|
||||
outline = "OUTLINE"
|
||||
elseif (outline == 1) then
|
||||
outline = "OUTLINE"
|
||||
@@ -650,7 +658,7 @@ end
|
||||
|
||||
elseif (widget_table.type == "execute" or widget_table.type == "button") then
|
||||
|
||||
local button = DF:NewButton (parent, nil, "$parentWidget" .. index, nil, 120, 18, widget_table.func, widget_table.param1, widget_table.param2, nil, widget_table.name, nil, button_template)
|
||||
local button = DF:NewButton (parent, nil, "$parentWidget" .. index, nil, 120, 18, widget_table.func, widget_table.param1, widget_table.param2, nil, widget_table.name, nil, button_template, text_template)
|
||||
if (not button_template) then
|
||||
button:InstallCustomTexture()
|
||||
end
|
||||
@@ -667,6 +675,28 @@ end
|
||||
tinsert (parent.widget_list, button)
|
||||
widget_created = button
|
||||
|
||||
|
||||
elseif (widget_table.type == "textentry") then
|
||||
local textentry = DF:CreateTextEntry (parent, widget_table.func, 120, 18, nil, "$parentWidget" .. index, nil, button_template)
|
||||
textentry.tooltip = widget_table.desc
|
||||
textentry.text = widget_table.get()
|
||||
textentry._get = widget_table.get
|
||||
textentry.widget_type = "textentry"
|
||||
textentry:SetHook ("OnEnterPressed", widget_table.set)
|
||||
textentry:SetHook ("OnEditFocusLost", widget_table.set)
|
||||
|
||||
local label = DF:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name .. (use_two_points and ": " or ""), "GameFontNormal", widget_table.text_template or text_template or 12)
|
||||
textentry:SetPoint ("left", label, "right", 2)
|
||||
label:SetPoint (cur_x, cur_y)
|
||||
|
||||
local size = label.widget:GetStringWidth() + 60 + 4
|
||||
if (size > max_x) then
|
||||
max_x = size
|
||||
end
|
||||
|
||||
tinsert (parent.widget_list, textentry)
|
||||
widget_created = textentry
|
||||
|
||||
end
|
||||
|
||||
if (widget_table.nocombat) then
|
||||
@@ -840,6 +870,8 @@ end
|
||||
widget:Select (widget._get())
|
||||
elseif (widget.widget_type == "toggle" or widget.widget_type == "range") then
|
||||
widget:SetValue (widget._get())
|
||||
elseif (widget.widget_type == "textentry") then
|
||||
widget:SetText (widget._get())
|
||||
elseif (widget.widget_type == "color") then
|
||||
local default_value, g, b, a = widget._get()
|
||||
if (type (default_value) == "table") then
|
||||
|
||||
+2
-2
@@ -1526,7 +1526,7 @@ end
|
||||
|
||||
local no_options = {}
|
||||
function DF:CreateSimplePanel (parent, w, h, title, name, panel_options, db)
|
||||
|
||||
|
||||
if (db and name and not db [name]) then
|
||||
db [name] = {scale = 1}
|
||||
end
|
||||
@@ -1540,7 +1540,7 @@ function DF:CreateSimplePanel (parent, w, h, title, name, panel_options, db)
|
||||
end
|
||||
|
||||
panel_options = panel_options or no_options
|
||||
|
||||
|
||||
local f = CreateFrame ("frame", name, UIParent)
|
||||
f:SetSize (w or 400, h or 250)
|
||||
f:SetPoint ("center", UIParent, "center", 0, 0)
|
||||
|
||||
+107
-18
@@ -12,7 +12,7 @@ local _
|
||||
window:SetMovable (true)
|
||||
tinsert (UISpecialFrames, "DetailsFrameworkImageEdit")
|
||||
window:SetFrameStrata ("TOOLTIP")
|
||||
window:SetMaxResize (266, 226)
|
||||
window:SetMaxResize (650, 500)
|
||||
|
||||
window.hooks = {}
|
||||
|
||||
@@ -20,13 +20,13 @@ local _
|
||||
background:SetAllPoints()
|
||||
background:SetTexture (0, 0, 0, .8)
|
||||
|
||||
local edit_texture = DF:NewImage (window, nil, 300, 250, "artwork", nil, nil, "$parentImage")
|
||||
local edit_texture = DF:NewImage (window, nil, 650, 500, "artwork", nil, nil, "$parentImage")
|
||||
edit_texture:SetAllPoints()
|
||||
|
||||
local background_frame = CreateFrame ("frame", "DetailsFrameworkImageEditBackground", DetailsFrameworkImageEdit)
|
||||
background_frame:SetPoint ("topleft", DetailsFrameworkImageEdit, "topleft", -10, 12)
|
||||
background_frame:SetFrameStrata ("DIALOG")
|
||||
background_frame:SetSize (400, 252)
|
||||
background_frame:SetSize (800, 540)
|
||||
|
||||
background_frame:SetResizable (true)
|
||||
background_frame:SetMovable (true)
|
||||
@@ -50,7 +50,7 @@ local _
|
||||
local topCoordTexture = DF:NewImage (window, nil, nil, nil, "overlay", nil, nil, "$parentImageTopCoord")
|
||||
topCoordTexture:SetPoint ("topleft", window, "topleft")
|
||||
topCoordTexture:SetPoint ("topright", window, "topright")
|
||||
topCoordTexture.color = "red"
|
||||
topCoordTexture:SetColorTexture (1, 0, 0)
|
||||
topCoordTexture.height = 1
|
||||
topCoordTexture.alpha = .2
|
||||
|
||||
@@ -63,9 +63,9 @@ local _
|
||||
topSlider:SetHook ("OnLeave", function() return true end)
|
||||
|
||||
local topSliderThumpTexture = topSlider:CreateTexture (nil, "overlay")
|
||||
topSliderThumpTexture:SetTexture (1, 1, 1)
|
||||
topSliderThumpTexture:SetColorTexture (1, 1, 1)
|
||||
topSliderThumpTexture:SetWidth (512)
|
||||
topSliderThumpTexture:SetHeight (3)
|
||||
topSliderThumpTexture:SetHeight (1)
|
||||
topSlider:SetThumbTexture (topSliderThumpTexture)
|
||||
|
||||
topSlider:SetHook ("OnValueChange", function (_, _, value)
|
||||
@@ -82,7 +82,7 @@ local _
|
||||
local bottomCoordTexture = DF:NewImage (window, nil, nil, nil, "overlay", nil, nil, "$parentImageBottomCoord")
|
||||
bottomCoordTexture:SetPoint ("bottomleft", window, "bottomleft", 0, 0)
|
||||
bottomCoordTexture:SetPoint ("bottomright", window, "bottomright", 0, 0)
|
||||
bottomCoordTexture.color = "red"
|
||||
bottomCoordTexture:SetColorTexture (1, 0, 0)
|
||||
bottomCoordTexture.height = 1
|
||||
bottomCoordTexture.alpha = .2
|
||||
|
||||
@@ -95,9 +95,9 @@ local _
|
||||
bottomSlider:SetHook ("OnLeave", function() return true end)
|
||||
|
||||
local bottomSliderThumpTexture = bottomSlider:CreateTexture (nil, "overlay")
|
||||
bottomSliderThumpTexture:SetTexture (1, 1, 1)
|
||||
bottomSliderThumpTexture:SetColorTexture (1, 1, 1)
|
||||
bottomSliderThumpTexture:SetWidth (512)
|
||||
bottomSliderThumpTexture:SetHeight (3)
|
||||
bottomSliderThumpTexture:SetHeight (1)
|
||||
bottomSlider:SetThumbTexture (bottomSliderThumpTexture)
|
||||
|
||||
bottomSlider:SetHook ("OnValueChange", function (_, _, value)
|
||||
@@ -115,7 +115,7 @@ local _
|
||||
local leftCoordTexture = DF:NewImage (window, nil, nil, nil, "overlay", nil, nil, "$parentImageLeftCoord")
|
||||
leftCoordTexture:SetPoint ("topleft", window, "topleft", 0, 0)
|
||||
leftCoordTexture:SetPoint ("bottomleft", window, "bottomleft", 0, 0)
|
||||
leftCoordTexture.color = "red"
|
||||
leftCoordTexture:SetColorTexture (1, 0, 0)
|
||||
leftCoordTexture.width = 1
|
||||
leftCoordTexture.alpha = .2
|
||||
|
||||
@@ -127,8 +127,8 @@ local _
|
||||
leftSlider:SetHook ("OnLeave", function() return true end)
|
||||
|
||||
local leftSliderThumpTexture = leftSlider:CreateTexture (nil, "overlay")
|
||||
leftSliderThumpTexture:SetTexture (1, 1, 1)
|
||||
leftSliderThumpTexture:SetWidth (3)
|
||||
leftSliderThumpTexture:SetColorTexture (1, 1, 1)
|
||||
leftSliderThumpTexture:SetWidth (1)
|
||||
leftSliderThumpTexture:SetHeight (512)
|
||||
leftSlider:SetThumbTexture (leftSliderThumpTexture)
|
||||
|
||||
@@ -146,7 +146,7 @@ local _
|
||||
local rightCoordTexture = DF:NewImage (window, nil, nil, nil, "overlay", nil, nil, "$parentImageRightCoord")
|
||||
rightCoordTexture:SetPoint ("topright", window, "topright", 0, 0)
|
||||
rightCoordTexture:SetPoint ("bottomright", window, "bottomright", 0, 0)
|
||||
rightCoordTexture.color = "red"
|
||||
rightCoordTexture:SetColorTexture (1, 0, 0)
|
||||
rightCoordTexture.width = 1
|
||||
rightCoordTexture.alpha = .2
|
||||
|
||||
@@ -158,8 +158,8 @@ local _
|
||||
rightSlider:SetHook ("OnLeave", function() return true end)
|
||||
--[
|
||||
local rightSliderThumpTexture = rightSlider:CreateTexture (nil, "overlay")
|
||||
rightSliderThumpTexture:SetTexture (1, 1, 1)
|
||||
rightSliderThumpTexture:SetWidth (3)
|
||||
rightSliderThumpTexture:SetColorTexture (1, 1, 1)
|
||||
rightSliderThumpTexture:SetWidth (1)
|
||||
rightSliderThumpTexture:SetHeight (512)
|
||||
rightSlider:SetThumbTexture (rightSliderThumpTexture)
|
||||
--]]
|
||||
@@ -399,9 +399,98 @@ local _
|
||||
flipButtonH:SetPoint ("topright", buttonsBackground, "topright", -8, -140)
|
||||
flipButtonH:InstallCustomTexture()
|
||||
--
|
||||
local flipButtonV = DF:NewButton (buttonsBackground, nil, "$parentFlipButton2", nil, 100, 20, flip, 2, nil, nil, "Flip V", 1)
|
||||
flipButtonV:SetPoint ("topright", buttonsBackground, "topright", -8, -160)
|
||||
flipButtonV:InstallCustomTexture()
|
||||
|
||||
|
||||
--> select area to crop
|
||||
local DragFrame = CreateFrame ("frame", nil, background_frame)
|
||||
DragFrame:EnableMouse (false)
|
||||
DragFrame:SetFrameStrata ("TOOLTIP")
|
||||
DragFrame:SetPoint ("topleft", edit_texture.widget, "topleft")
|
||||
DragFrame:SetPoint ("bottomright", edit_texture.widget, "bottomright")
|
||||
DragFrame:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Worldmap\UI-QuestBlob-Inside]], tileSize = 256, tile = true})
|
||||
DragFrame:SetBackdropColor (1, 1, 1, .2)
|
||||
DragFrame:Hide()
|
||||
|
||||
local SelectionBox_Up = DragFrame:CreateTexture (nil, "overlay")
|
||||
SelectionBox_Up:SetHeight (1)
|
||||
SelectionBox_Up:SetColorTexture (1, 1, 1)
|
||||
local SelectionBox_Down = DragFrame:CreateTexture (nil, "overlay")
|
||||
SelectionBox_Down:SetHeight (1)
|
||||
SelectionBox_Down:SetColorTexture (1, 1, 1)
|
||||
local SelectionBox_Left = DragFrame:CreateTexture (nil, "overlay")
|
||||
SelectionBox_Left:SetWidth (1)
|
||||
SelectionBox_Left:SetColorTexture (1, 1, 1)
|
||||
local SelectionBox_Right = DragFrame:CreateTexture (nil, "overlay")
|
||||
SelectionBox_Right:SetWidth (1)
|
||||
SelectionBox_Right:SetColorTexture (1, 1, 1)
|
||||
|
||||
function DragFrame.ClearSelectionBoxPoints()
|
||||
SelectionBox_Up:ClearAllPoints()
|
||||
SelectionBox_Down:ClearAllPoints()
|
||||
SelectionBox_Left:ClearAllPoints()
|
||||
SelectionBox_Right:ClearAllPoints()
|
||||
end
|
||||
|
||||
local StartCrop = function()
|
||||
DragFrame:Show()
|
||||
DragFrame:EnableMouse (true)
|
||||
end
|
||||
|
||||
local CropSelection = DF:NewButton (buttonsBackground, nil, "$parentCropSelection", nil, 100, 20, StartCrop, 2, nil, nil, "Crop Selection", 1)
|
||||
--CropSelection:SetPoint ("topright", buttonsBackground, "topright", -8, -260)
|
||||
CropSelection:InstallCustomTexture()
|
||||
|
||||
DragFrame.OnTick = function (self, deltaTime)
|
||||
local x1, y1 = unpack (self.ClickedAt)
|
||||
local x2, y2 = GetCursorPosition()
|
||||
DragFrame.ClearSelectionBoxPoints()
|
||||
|
||||
print (x1, y1, x2, y2)
|
||||
|
||||
if (x2 > x1) then
|
||||
--right
|
||||
if (y1 > y2) then
|
||||
--top
|
||||
SelectionBox_Up:SetPoint ("topleft", UIParent, "bottomleft", x1, y1)
|
||||
SelectionBox_Up:SetPoint ("topright", UIParent, "bottomleft", x2, y1)
|
||||
|
||||
SelectionBox_Left:SetPoint ("topleft", UIParent, "bottomleft", x1, y1)
|
||||
SelectionBox_Left:SetPoint ("bottomleft", UIParent, "bottomleft", x1, y2)
|
||||
|
||||
print (1)
|
||||
else
|
||||
--bottom
|
||||
|
||||
end
|
||||
else
|
||||
--left
|
||||
if (y2 > y1) then
|
||||
--top
|
||||
|
||||
else
|
||||
--bottom
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
DragFrame:SetScript ("OnMouseDown", function (self, MouseButton)
|
||||
if (MouseButton == "LeftButton") then
|
||||
self.ClickedAt = {GetCursorPosition()}
|
||||
DragFrame:SetScript ("OnUpdate", DragFrame.OnTick)
|
||||
|
||||
end
|
||||
end)
|
||||
DragFrame:SetScript ("OnMouseUp", function (self, MouseButton)
|
||||
if (MouseButton == "LeftButton") then
|
||||
self.ReleaseAt = {GetCursorPosition()}
|
||||
DragFrame:EnableMouse (false)
|
||||
DragFrame:Hide()
|
||||
DragFrame:SetScript ("OnUpdate", nil)
|
||||
print (self.ClickedAt[1], self.ClickedAt[2], self.ReleaseAt[1], self.ReleaseAt[2])
|
||||
end
|
||||
end)
|
||||
|
||||
--> accept
|
||||
window.accept = function (self, b, keep_editing)
|
||||
|
||||
@@ -369,7 +369,7 @@ DF.TextEntryCounter = DF.TextEntryCounter or 1
|
||||
local OnEnterPressed = function (textentry, byScript)
|
||||
local capsule = textentry.MyObject
|
||||
|
||||
local kill = capsule:RunHooksForWidget ("OnEnterPressed", textentry, capsule)
|
||||
local kill = capsule:RunHooksForWidget ("OnEnterPressed", textentry, capsule, capsule.text)
|
||||
if (kill) then
|
||||
return
|
||||
end
|
||||
@@ -398,7 +398,7 @@ DF.TextEntryCounter = DF.TextEntryCounter or 1
|
||||
local OnEscapePressed = function (textentry)
|
||||
local capsule = textentry.MyObject
|
||||
|
||||
local kill = capsule:RunHooksForWidget ("OnEscapePressed", textentry, capsule)
|
||||
local kill = capsule:RunHooksForWidget ("OnEscapePressed", textentry, capsule, capsule.text)
|
||||
if (kill) then
|
||||
return
|
||||
end
|
||||
@@ -422,7 +422,7 @@ DF.TextEntryCounter = DF.TextEntryCounter or 1
|
||||
|
||||
if (textentry:IsShown()) then
|
||||
|
||||
local kill = capsule:RunHooksForWidget ("OnEditFocusLost", textentry, capsule)
|
||||
local kill = capsule:RunHooksForWidget ("OnEditFocusLost", textentry, capsule, capsule.text)
|
||||
if (kill) then
|
||||
return
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user