Reorganizing for submodule use.

main
ck 11 months ago
parent 328b9c77e3
commit 132c1e94da
  1. 0
      CallbackHandler-1.0/CallbackHandler-1.0.lua
  2. 0
      CallbackHandler-1.0/CallbackHandler-1.0.xml
  3. 0
      DiesalComm-1.0/ChatThrottleLib.lua
  4. 0
      DiesalComm-1.0/DiesalComm-1.0.lua
  5. 0
      DiesalComm-1.0/DiesalComm-1.0.xml
  6. 0
      DiesalGUI-2.0/DiesalGUI-2.0.lua
  7. 0
      DiesalGUI-2.0/DiesalGUI-2.0.xml
  8. 0
      DiesalGUI-2.0/Objects/Accordian.lua
  9. 0
      DiesalGUI-2.0/Objects/AccordianSection.lua
  10. 0
      DiesalGUI-2.0/Objects/Bar.lua
  11. 0
      DiesalGUI-2.0/Objects/Branch.lua
  12. 0
      DiesalGUI-2.0/Objects/Button.lua
  13. 0
      DiesalGUI-2.0/Objects/CheckBox.lua
  14. 0
      DiesalGUI-2.0/Objects/ComboBox.lua
  15. 0
      DiesalGUI-2.0/Objects/ComboBoxItem.lua
  16. 0
      DiesalGUI-2.0/Objects/Container.lua
  17. 0
      DiesalGUI-2.0/Objects/DropDown.lua
  18. 0
      DiesalGUI-2.0/Objects/DropDownItem.lua
  19. 7
      DiesalGUI-2.0/Objects/IconToggle.lua
  20. 0
      DiesalGUI-2.0/Objects/Input.lua
  21. 0
      DiesalGUI-2.0/Objects/ObjectBase.lua
  22. 0
      DiesalGUI-2.0/Objects/QuickDoc.lua
  23. 0
      DiesalGUI-2.0/Objects/ScrollFrame.lua
  24. 0
      DiesalGUI-2.0/Objects/ScrollingEditBox.lua
  25. 0
      DiesalGUI-2.0/Objects/ScrollingMessageFrame.lua
  26. 0
      DiesalGUI-2.0/Objects/Spinner.lua
  27. 0
      DiesalGUI-2.0/Objects/Text.lua
  28. 0
      DiesalGUI-2.0/Objects/Toggle.lua
  29. 0
      DiesalGUI-2.0/Objects/Tree.lua
  30. 0
      DiesalGUI-2.0/Objects/Window.lua
  31. 0
      DiesalMenu-2.0/DiesalMenu-2.0.lua
  32. 0
      DiesalMenu-2.0/DiesalMenu-2.0.xml
  33. 0
      DiesalMenu-2.0/Objects/Menu.lua
  34. 0
      DiesalMenu-2.0/Objects/MenuItem.lua
  35. 23
      DiesalStyle-2.0/DiesalStyle-2.0.lua
  36. 0
      DiesalStyle-2.0/Media/Fonts/DejaVuSansMono-Bold.ttf
  37. 0
      DiesalStyle-2.0/Media/Fonts/DejaVuSansMono.ttf
  38. 0
      DiesalStyle-2.0/Media/Fonts/FFF Intelligent Thin Condensed.ttf
  39. 0
      DiesalStyle-2.0/Media/Fonts/FiraMono-Bold.ttf
  40. 0
      DiesalStyle-2.0/Media/Fonts/FiraMono-Medium.ttf
  41. 0
      DiesalStyle-2.0/Media/Fonts/FiraMono-Regular.ttf
  42. 0
      DiesalStyle-2.0/Media/Fonts/FiraSans-Regular.ttf
  43. 0
      DiesalStyle-2.0/Media/Fonts/Hack-Bold.ttf
  44. 0
      DiesalStyle-2.0/Media/Fonts/Hack-Regular.ttf
  45. 0
      DiesalStyle-2.0/Media/Fonts/Inconsolata-Bold.ttf
  46. 0
      DiesalStyle-2.0/Media/Fonts/Inconsolata-Regular.ttf
  47. 0
      DiesalStyle-2.0/Media/Fonts/LUCON.TTF
  48. 0
      DiesalStyle-2.0/Media/Fonts/MaterialIcons-Regular.ttf
  49. 0
      DiesalStyle-2.0/Media/Fonts/MaterialIconsOutlined-Regular.otf
  50. 0
      DiesalStyle-2.0/Media/Fonts/MaterialIconsRound-Regular.otf
  51. 0
      DiesalStyle-2.0/Media/Fonts/MaterialIconsSharp-Regular.otf
  52. 0
      DiesalStyle-2.0/Media/Fonts/MaterialIconsTwoTone-Regular.otf
  53. 0
      DiesalStyle-2.0/Media/Fonts/OfficeCodePro-Bold.ttf
  54. 0
      DiesalStyle-2.0/Media/Fonts/OfficeCodePro-Medium.ttf
  55. 0
      DiesalStyle-2.0/Media/Fonts/OfficeCodePro-Regular.ttf
  56. 0
      DiesalStyle-2.0/Media/Fonts/RobotoMono-Bold.ttf
  57. 0
      DiesalStyle-2.0/Media/Fonts/RobotoMono-Medium.ttf
  58. 0
      DiesalStyle-2.0/Media/Fonts/RobotoMono-Regular.ttf
  59. 0
      DiesalStyle-2.0/Media/Fonts/SourceCodePro-Black.ttf
  60. 0
      DiesalStyle-2.0/Media/Fonts/SourceCodePro-Bold.ttf
  61. 0
      DiesalStyle-2.0/Media/Fonts/SourceCodePro-Medium.ttf
  62. 0
      DiesalStyle-2.0/Media/Fonts/SourceCodePro-Regular.ttf
  63. 0
      DiesalStyle-2.0/Media/Fonts/SourceCodePro-Semibold.ttf
  64. 0
      DiesalStyle-2.0/Media/Fonts/Standard0755.ttf
  65. 0
      DiesalStyle-2.0/Media/Fonts/UbuntuMono-B.ttf
  66. 0
      DiesalStyle-2.0/Media/Fonts/UbuntuMono-R.ttf
  67. 0
      DiesalStyle-2.0/Media/Fonts/calibrib.ttf
  68. 0
      DiesalStyle-2.0/Media/Fonts/monof55.ttf
  69. 0
      DiesalStyle-2.0/Media/Fonts/monof56.ttf
  70. 0
      DiesalStyle-2.0/Media/Textures/DiesalButtonIcons32x128x512.tga
  71. 0
      DiesalStyle-2.0/Media/Textures/DiesalGUIcons16x256x128.tga
  72. 0
      DiesalStyle-2.0/Media/Textures/DiesalGUIcons32x256x256.tga
  73. 0
      DiesalStyle-2.0/Media/Textures/DiesalGUIcons64x256x256.tga
  74. 0
      DiesalStyle-2.0/Media/Textures/shadow.tga
  75. 0
      DiesalStyle-2.0/Media/Textures/shadowNoDist.tga
  76. 0
      DiesalTools-2.0/DiesalTools-2.0.lua
  77. 0
      LibSharedMedia-3.0/LibSharedMedia-3.0.lua
  78. 0
      LibSharedMedia-3.0/lib.xml
  79. 5
      README.md

@ -90,14 +90,15 @@ local methods = {
self:SetWidth(settings.width) self:SetWidth(settings.width)
self:SetHeight(settings.height) self:SetHeight(settings.height)
self.check:SetFont(MaterialIconsRegular:GetFont(), settings.height + 1, "") self.check:SetFont(MaterialSymbolsRounded:GetFont(), settings.height + 1, "")
end, end,
---@param self Diesal.GUI.Object.IconToggle ---@param self Diesal.GUI.Object.IconToggle
---@param value boolean ---@param value boolean
SetChecked = function(self, value) SetChecked = function(self, value)
self.settings.checked = value self.settings.checked = value
self.check:SetText(value and DiesalStyle.MaterialIcon("check_box") or DiesalStyle.MaterialIcon("check_box_outline_blank")) self.check:SetText(value and DiesalStyle.MaterialIcon("check_box") or
DiesalStyle.MaterialIcon("check_box_outline_blank"))
self.frame:SetChecked(value) self.frame:SetChecked(value)
self[self.settings.disabled and "Disable" or "Enable"](self) self[self.settings.disabled and "Disable" or "Enable"](self)
@ -187,7 +188,7 @@ local function Constructor()
local check = self:CreateRegion("FontString", "check", frame) local check = self:CreateRegion("FontString", "check", frame)
check:SetAllPoints(frame, true) check:SetAllPoints(frame, true)
--check:SetAllPoints(frame, true) --check:SetAllPoints(frame, true)
check:SetFont(MaterialIconsRegular:GetFont(), self.defaults.height, "") check:SetFont(MaterialSymbolsRounded:GetFont(), self.defaults.height, "")
-- Setting self.check again is pointless when CreateRegion already does it.... -- Setting self.check again is pointless when CreateRegion already does it....
-- self.check = check -- self.check = check

@ -178,7 +178,8 @@ local function setColor(texture, r, g, b, a)
local status, err = pcall(texture.SetColorTexture, texture, r, g, b, a) local status, err = pcall(texture.SetColorTexture, texture, r, g, b, a)
if not status then if not status then
errorhandler( errorhandler(
'error in "' .. (texture.style.name or "texture") .. '" ' .. texture.style.mode .. " or alpha setting", r, g, b, 'error in "' .. (texture.style.name or "texture") .. '" ' .. texture.style.mode .. " or alpha setting", r, g,
b,
a) a)
end end
end end
@ -187,7 +188,7 @@ local function setGradient(texture, orientation, r1, g1, b1, a1, r2, g2, b2, a2)
CreateColor(r2, g2, b2, a2)) CreateColor(r2, g2, b2, a2))
if not status then if not status then
errorhandler('error in "' .. errorhandler('error in "' ..
(texture.style.name or "texture") .. '" ' .. texture.style.mode .. " or alpha setting.") (texture.style.name or "texture") .. '" ' .. texture.style.mode .. " or alpha setting.")
end end
end end
-- ~~| Media |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- ~~| Media |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -12275,9 +12276,9 @@ function DiesalStyle:StyleTexture(texture, style)
-- gradient -- gradient
if texture.style.gradient then if texture.style.gradient then
texture.style.gradient.orientation = style.gradient_orientation or texture.style.gradient.orientation or texture.style.gradient.orientation = style.gradient_orientation or texture.style.gradient.orientation or
DEFAULT_GRADIENT_ORIENTATION DEFAULT_GRADIENT_ORIENTATION
texture.style.gradient.color = style.gradient_color or texture.style.gradient.color or texture.style.gradient.color = style.gradient_color or texture.style.gradient.color or
{ DEFAULT_COLOR, DEFAULT_COLOR } { DEFAULT_COLOR, DEFAULT_COLOR }
end end
-- image -- image
if texture.style.image then if texture.style.image then
@ -12340,9 +12341,9 @@ function DiesalStyle:StyleTexture(texture, style)
texture:SetColorTexture(1, 1, 1, 1) -- clear color texture:SetColorTexture(1, 1, 1, 1) -- clear color
-- apply settings -- apply settings
local r1, g1, b1 = GetBlizzColorValues(texture.style.gradient.color local r1, g1, b1 = GetBlizzColorValues(texture.style.gradient.color
[texture.style.gradient.orientation == "HORIZONTAL" and 1 or 2]) [texture.style.gradient.orientation == "HORIZONTAL" and 1 or 2])
local r2, g2, b2 = GetBlizzColorValues(texture.style.gradient.color local r2, g2, b2 = GetBlizzColorValues(texture.style.gradient.color
[texture.style.gradient.orientation == "HORIZONTAL" and 2 or 1]) [texture.style.gradient.orientation == "HORIZONTAL" and 2 or 1])
local a1, a2 = local a1, a2 =
texture.style.alpha[texture.style.gradient.orientation == "HORIZONTAL" and 1 or 2], texture.style.alpha[texture.style.gradient.orientation == "HORIZONTAL" and 1 or 2],
texture.style.alpha[texture.style.gradient.orientation == "HORIZONTAL" and 2 or 1] texture.style.alpha[texture.style.gradient.orientation == "HORIZONTAL" and 2 or 1]
@ -12392,7 +12393,7 @@ function DiesalStyle:StyleOutline(leftTexture, rightTexture, topTexture, bottomT
} }
end end
style.gradient_orientation = style.gradient_orientation and style.gradient_orientation = style.gradient_orientation and
style.gradient_orientation:upper() --formatOrientation(style.gradient_orientation) -- fuck you style.gradient_orientation:upper() --formatOrientation(style.gradient_orientation) -- fuck you
if not texture.style.gradient and (style.gradient_orientation or style.gradient_alpha or style.gradient_color) then if not texture.style.gradient and (style.gradient_orientation or style.gradient_alpha or style.gradient_color) then
texture.style.gradient = {} texture.style.gradient = {}
end end
@ -12406,9 +12407,9 @@ function DiesalStyle:StyleOutline(leftTexture, rightTexture, topTexture, bottomT
-- gradient -- gradient
if texture.style.gradient then if texture.style.gradient then
texture.style.gradient.orientation = style.gradient_orientation or texture.style.gradient.orientation or texture.style.gradient.orientation = style.gradient_orientation or texture.style.gradient.orientation or
DEFAULT_GRADIENT_ORIENTATION DEFAULT_GRADIENT_ORIENTATION
texture.style.gradient.color = style.gradient_color or texture.style.gradient.color or texture.style.gradient.color = style.gradient_color or texture.style.gradient.color or
{ DEFAULT_COLOR, DEFAULT_COLOR } { DEFAULT_COLOR, DEFAULT_COLOR }
end end
-- | Apply Settings |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- | Apply Settings |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -12588,7 +12589,7 @@ end
---@param style Diesal.Style.ShadowStyle ---@param style Diesal.Style.ShadowStyle
function DiesalStyle:StyleShadow(object, frame, style) function DiesalStyle:StyleShadow(object, frame, style)
object.shadow = object.shadow or object.shadow = object.shadow or
CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate") --CreateFrame("Frame",nil,frame) CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate") --CreateFrame("Frame",nil,frame)
object.shadow:Show() object.shadow:Show()
if not object.shadow.style or style.clear then if not object.shadow.style or style.clear then
object.shadow.style = {} object.shadow.style = {}
@ -12597,7 +12598,7 @@ function DiesalStyle:StyleShadow(object, frame, style)
-- ~~ Format New Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- ~~ Format New Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
local red, green, blue = DiesalTools.GetColor(style.color) local red, green, blue = DiesalTools.GetColor(style.color)
local offset = style.offset and type(style.offset) == "number" and local offset = style.offset and type(style.offset) == "number" and
{ style.offset, style.offset, style.offset, style.offset } or style.offset { style.offset, style.offset, style.offset, style.offset } or style.offset
-- Setting ~~~~~~~~~~~~~~~~~~~~~~~ New Setting ~~~~~~~~~~~~~~~ Old Setting ~~~~~~~~~~~~~~~~~ Default ~~~~~~~~~~~~~~~~~~ -- Setting ~~~~~~~~~~~~~~~~~~~~~~~ New Setting ~~~~~~~~~~~~~~~ Old Setting ~~~~~~~~~~~~~~~~~ Default ~~~~~~~~~~~~~~~~~~
shadowStyle.edgeFile = style.edgeFile or shadowStyle.edgeFile or getMedia("border", "shadow") shadowStyle.edgeFile = style.edgeFile or shadowStyle.edgeFile or getMedia("border", "shadow")
shadowStyle.edgeSize = style.edgeSize or shadowStyle.edgeSize or 28 shadowStyle.edgeSize = style.edgeSize or shadowStyle.edgeSize or 28

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

@ -1,5 +0,0 @@
# DiesalLibs
Required Libraries:
- [LibSharedMedia 3.0](https://www.curseforge.com/wow/addons/libsharedmedia-3-0)
- [CallbackHandler 1.0](https://www.curseforge.com/wow/addons/callbackhandler)
Loading…
Cancel
Save