General development and bug fixes (see commit description).
- Fixed the deaths display, where the windows wasn't usig custom text scripts. - Fixed an issue with custom displays, where it was unable to use class colors in their texts. - More development and bug fixes on the new Mythic+ Run Completion panel. - Framework Update.
This commit is contained in:
+50
-18
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
local dversion = 510
|
||||
local dversion = 511
|
||||
local major, minor = "DetailsFramework-1.0", dversion
|
||||
local DF, oldminor = LibStub:NewLibrary(major, minor)
|
||||
|
||||
@@ -2522,6 +2522,28 @@ DF.dropdown_templates["OPTIONS_DROPDOWNDARK_TEMPLATE"] = {
|
||||
dropiconpoints = {-2, -3},
|
||||
}
|
||||
|
||||
DF.dropdown_templates["OLD_DROPDOWN_TEMPLATE"] = {
|
||||
height = 24,
|
||||
|
||||
backdrop = {
|
||||
edgeFile = "Interface\\Buttons\\UI-SliderBar-Border",
|
||||
edgeSize = 8,
|
||||
bgFile = [[Interface\Tooltips\UI-Tooltip-Background]],
|
||||
tileSize = 64,
|
||||
tile = true,
|
||||
insets = {left = 4, right = 4, top = 4, bottom = 4}
|
||||
},
|
||||
|
||||
backdropcolor = {0.1215, 0.1176, 0.1294, 0.4000},
|
||||
backdropbordercolor = {1, 1, 1, 1},
|
||||
onentercolor = {.5, .5, .5, .9},
|
||||
onenterbordercolor = {1, 1, 1, 1},
|
||||
|
||||
dropicon = "Interface\\BUTTONS\\arrow-Down-Down",
|
||||
dropiconsize = {16, 16},
|
||||
dropiconpoints = {-2, -3},
|
||||
}
|
||||
|
||||
--switches
|
||||
DF.switch_templates = DF.switch_templates or {}
|
||||
DF.switch_templates["OPTIONS_CHECKBOX_TEMPLATE"] = {
|
||||
@@ -2534,6 +2556,23 @@ DF.switch_templates["OPTIONS_CHECKBOX_TEMPLATE"] = {
|
||||
disabled_backdropcolor = {1, 1, 1, .2},
|
||||
onenterbordercolor = {1, 1, 1, 1},
|
||||
}
|
||||
|
||||
DF.switch_templates["OPTIONS_CIRCLECHECKBOX_TEMPLATE"] = {
|
||||
width = 18,
|
||||
height = 18,
|
||||
is_checkbox = true, --will call SetAsCheckBox()
|
||||
checked_texture = [[Interface\CHARACTERFRAME\TempPortraitAlphaMaskSmall]],
|
||||
checked_size_percent = 0.7,
|
||||
checked_xoffset = 0,
|
||||
checked_yoffset = 0,
|
||||
checked_color = "dark3",
|
||||
rounded_corner = {
|
||||
color = {.075, .075, .075, 1},
|
||||
border_color = {.2, .2, .2, 1},
|
||||
roundness = 8,
|
||||
},
|
||||
}
|
||||
|
||||
DF.switch_templates["OPTIONS_CHECKBOX_BRIGHT_TEMPLATE"] = {
|
||||
backdrop = {edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true},
|
||||
backdropcolor = {1, 1, 1, .5},
|
||||
@@ -2553,6 +2592,14 @@ DF.button_templates["OPTIONS_BUTTON_TEMPLATE"] = {
|
||||
backdropbordercolor = {0, 0, 0, 1},
|
||||
}
|
||||
|
||||
DF.button_templates["OPTIONS_CIRCLEBUTTON_TEMPLATE"] = {
|
||||
rounded_corner = {
|
||||
color = {.075, .075, .075, 1},
|
||||
border_color = {.2, .2, .2, 1},
|
||||
roundness = 8,
|
||||
},
|
||||
}
|
||||
|
||||
DF.button_templates["OPTIONS_BUTTON_GOLDENBORDER_TEMPLATE"] = {
|
||||
backdrop = {edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true},
|
||||
backdropcolor = {1, 1, 1, .5},
|
||||
@@ -3905,7 +3952,7 @@ function DF:GetClassSpecIds(engClass) --naming conventions
|
||||
end
|
||||
|
||||
local dispatch_error = function(context, errortext)
|
||||
DF:Msg( (context or "<no context>") .. " |cFFFF9900error|r: " .. (errortext or "<no error given>"))
|
||||
error((context or "") .. (errortext or ""))
|
||||
end
|
||||
|
||||
--call a function with payload, if the callback doesn't exists, quit silently
|
||||
@@ -3930,23 +3977,8 @@ end
|
||||
---@param ... any
|
||||
---@return any
|
||||
function DF:Dispatch(func, ...)
|
||||
if (type(func) ~= "function") then
|
||||
return dispatch_error(_, "DetailsFramework:Dispatch(func) expect a function as parameter 1.")
|
||||
end
|
||||
assert(type(func) == "function", "DetailsFramework:Dispatch(func) expect a function as parameter 1. Received: " .. type(func) .. " instead.")
|
||||
return select(2, xpcall(func, geterrorhandler(), ...))
|
||||
|
||||
--[=[
|
||||
local dispatchResult = {xpcall(func, geterrorhandler(), ...)}
|
||||
local okay = dispatchResult[1]
|
||||
|
||||
if (not okay) then
|
||||
return false
|
||||
end
|
||||
|
||||
tremove(dispatchResult, 1)
|
||||
|
||||
return unpack(dispatchResult)
|
||||
--]=]
|
||||
end
|
||||
|
||||
--[=[
|
||||
|
||||
Reference in New Issue
Block a user