From 70e1af340beb4e8a4e389ce2eb344979f15f3264 Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Fri, 3 Jun 2022 12:48:07 -0300 Subject: [PATCH] framework update --- Libs/DF/fw.lua | 2 +- Libs/DF/panel.lua | 14 +++++++++++--- core/plugins.lua | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 2ba87375..5869debe 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 314 +local dversion = 315 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) diff --git a/Libs/DF/panel.lua b/Libs/DF/panel.lua index 82192bb0..a47e8cb8 100644 --- a/Libs/DF/panel.lua +++ b/Libs/DF/panel.lua @@ -1584,9 +1584,10 @@ function DF:IconPick (callback, close_when_select, param1, param2) DF.IconPickFrame.preview:Hide() --serach - DF.IconPickFrame.searchLabel = DF:NewLabel (DF.IconPickFrame, nil, "$parentSearchBoxLabel", nil, "search:") + DF.IconPickFrame.searchLabel = DF:NewLabel (DF.IconPickFrame, nil, "$parentSearchBoxLabel", nil, "Search:") DF.IconPickFrame.searchLabel:SetPoint ("topleft", DF.IconPickFrame, "topleft", 12, -36) DF.IconPickFrame.searchLabel:SetTemplate (DF:GetTemplate ("font", "ORANGE_FONT_TEMPLATE")) + DF.IconPickFrame.searchLabel.fontsize = 12 DF.IconPickFrame.search = DF:NewTextEntry (DF.IconPickFrame, nil, "$parentSearchBox", nil, 140, 20) DF.IconPickFrame.search:SetPoint ("left", DF.IconPickFrame.searchLabel, "right", 2, 0) @@ -1609,6 +1610,7 @@ function DF:IconPick (callback, close_when_select, param1, param2) --manually enter the icon path DF.IconPickFrame.customIcon = DF:CreateLabel (DF.IconPickFrame, "Icon Path:", DF:GetTemplate ("font", "ORANGE_FONT_TEMPLATE")) DF.IconPickFrame.customIcon:SetPoint ("bottomleft", DF.IconPickFrame, "bottomleft", 12, 16) + DF.IconPickFrame.customIcon.fontsize = 12 DF.IconPickFrame.customIconEntry = DF:CreateTextEntry (DF.IconPickFrame, function()end, 200, 20, "CustomIconEntry", _, _, DF:GetTemplate ("dropdown", "OPTIONS_DROPDOWN_TEMPLATE")) DF.IconPickFrame.customIconEntry:SetPoint ("left", DF.IconPickFrame.customIcon, "right", 2, 0) @@ -1652,11 +1654,13 @@ function DF:IconPick (callback, close_when_select, param1, param2) local MACRO_ICON_FILENAMES = {} local SPELLNAMES_CACHE = {} + local texturePathGetter = DF.IconPickFrame:CreateTexture(nil, "overlay") + DF.IconPickFrame:SetScript ("OnShow", function() MACRO_ICON_FILENAMES [1] = "INV_MISC_QUESTIONMARK" local index = 2 - + for i = 1, GetNumSpellTabs() do local tab, tabTex, offset, numSpells, _ = GetSpellTabInfo (i) offset = offset + 1 @@ -1691,7 +1695,7 @@ function DF:IconPick (callback, close_when_select, param1, param2) GetLooseMacroIcons (MACRO_ICON_FILENAMES) GetMacroIcons (MACRO_ICON_FILENAMES) GetMacroItemIcons (MACRO_ICON_FILENAMES) - + --reset the custom icon text entry DF.IconPickFrame.customIconEntry:SetText ("") --reset the search text entry @@ -1832,6 +1836,10 @@ function DF:IconPick (callback, close_when_select, param1, param2) newcheck:SetScript ("OnEnter", onenter) newcheck:SetScript ("OnLeave", onleave) end + + for _, button in ipairs(DF.IconPickFrame.buttons) do + button:SetBackdropBorderColor(0, 0, 0, 1) + end local scroll = CreateFrame ("ScrollFrame", "DetailsFrameworkIconPickFrameScroll", DF.IconPickFrame, "ListScrollFrameTemplate", "BackdropTemplate") DF:ReskinSlider (scroll) diff --git a/core/plugins.lua b/core/plugins.lua index 5521aa20..0a4e0dac 100644 --- a/core/plugins.lua +++ b/core/plugins.lua @@ -467,9 +467,13 @@ statusBar:SetPoint ("topleft", menuBackground, "bottomleft", 0, 1) statusBar:SetPoint ("topright", f, "bottomright", 0, 1) statusBar:SetHeight (20) - _detalhes.gump:ApplyStandardBackdrop (statusBar) statusBar:SetAlpha (1) - _detalhes.gump:BuildStatusbarAuthorInfo (statusBar) + DetailsFramework:BuildStatusbarAuthorInfo (statusBar) + DetailsFramework:ApplyStandardBackdrop (statusBar) + local extraDarkTexture = statusBar:CreateTexture(nil, "background") + extraDarkTexture:SetAllPoints() + extraDarkTexture:SetColorTexture(.2, .2, .2, .8) + -- local right_click_to_back = _detalhes.gump:CreateLabel (statusBar, "right click to close", 10, "gray") right_click_to_back:SetPoint ("bottomright", statusBar, "bottomright", -1, 5)