diff --git a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua index 7acfcf6..77e3a1d 100644 --- a/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua +++ b/Interface/AddOns/SVUI/libs/LibSuperVillain-1.0/modules/Registry.lua @@ -230,33 +230,17 @@ local function SanitizeStorage(data) end end -local function LiveProfileChange() - local LastKey = SOURCE_KEY - if(PROFILE_SV.SAFEDATA and PROFILE_SV.SAFEDATA.dualSpecEnabled) then - SOURCE_KEY = GetSpecialization() - lib.EventManager:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED") - - if(not SOURCE_KEY) then - SOURCE_KEY = 1 - end - - if(LastKey ~= SOURCE_KEY) then - --construct core dataset - local db = rawget(CoreObject.db, "data") - db = PROFILE_SV.STORED[SOURCE_KEY] - - local cache = rawget(CoreObject.cache, "data") - cache = CACHE_SV.STORED[SOURCE_KEY] - - if(CoreObject.ReLoad) then - CoreObject:ReLoad() - end - - lib:RefreshAll() +local function copydefaults(d, s) + if(type(s) ~= "table") then return end + if(type(d) ~= "table") then return end + for k, v in pairs(s) do + local saved = rawget(d, k) + if type(v) == "table" then + if not saved then rawset(d, k, {}) end + copydefaults(d[k], v) + else + rawset(d, k, v) end - else - SOURCE_KEY = 1 - lib.EventManager:UnregisterEvent("ACTIVE_TALENT_GROUP_CHANGED") end end @@ -360,6 +344,41 @@ local meta_database = { end, } +local function LiveProfileChange() + local LastKey = SOURCE_KEY + if(PROFILE_SV.SAFEDATA and PROFILE_SV.SAFEDATA.dualSpecEnabled) then + SOURCE_KEY = GetSpecialization() + lib.EventManager:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED") + + if(not SOURCE_KEY) then + SOURCE_KEY = 1 + end + + if(LastKey ~= SOURCE_KEY) then + --construct core dataset + local db = setmetatable({}, meta_transdata) + db.data = PROFILE_SV.STORED[SOURCE_KEY] + db.defaults = CoreObject.configs + wipe(CoreObject.db) + CoreObject.db = db + + local cache = setmetatable({}, meta_database) + cache.data = PROFILE_SV.STORED[SOURCE_KEY] + wipe(CoreObject.cache) + CoreObject.cache = cache + + if(CoreObject.ReLoad) then + CoreObject:ReLoad() + end + + lib:RefreshAll() + end + else + SOURCE_KEY = 1 + lib.EventManager:UnregisterEvent("ACTIVE_TALENT_GROUP_CHANGED") + end +end + --DATABASE PUBLIC METHODS function lib:Remove(key) if(GLOBAL_SV.profiles[key]) then GLOBAL_SV.profiles[key] = nil end diff --git a/Interface/AddOns/SVUI/scripts/mounts.lua b/Interface/AddOns/SVUI/scripts/mounts.lua index 0271bdc..b51b4cc 100644 --- a/Interface/AddOns/SVUI/scripts/mounts.lua +++ b/Interface/AddOns/SVUI/scripts/mounts.lua @@ -282,7 +282,7 @@ local function SetMountCheckButtons() UpdateMountsCache() local scrollFrame = MountJournal.ListScrollFrame; - -- local scrollBar = _G["MountJournalListScrollFrameScrollBar"] + local scrollBar = _G["MountJournalListScrollFrameScrollBar"] local buttons = scrollFrame.buttons; for i = 1, #buttons do @@ -354,9 +354,6 @@ local function SetMountCheckButtons() UpdateMountCheckboxes(button, i) end - - -- scrollFrame:HookScript("OnMouseWheel", Update_MountCheckButtons) - -- scrollBar:HookScript("OnValueChanged", Update_MountCheckButtons) UpdateCurrentMountSelection() MountListener:RegisterEvent("MOUNT_JOURNAL_USABILITY_CHANGED") @@ -366,6 +363,8 @@ local function SetMountCheckButtons() MountListener:RegisterEvent("COMPANION_UPDATE") MountListener:SetScript("OnEvent", ProxyUpdate_Mounts) + scrollFrame:HookScript("OnMouseWheel", Update_MountCheckButtons) + scrollBar:HookScript("OnValueChanged", Update_MountCheckButtons) NewHook("MountJournal_UpdateMountList", Update_MountCheckButtons) end --[[ diff --git a/Interface/AddOns/SVUI/xml/widgets.xml b/Interface/AddOns/SVUI/xml/widgets.xml index 02627c5..4604030 100644 --- a/Interface/AddOns/SVUI/xml/widgets.xml +++ b/Interface/AddOns/SVUI/xml/widgets.xml @@ -80,14 +80,14 @@ <Frame name="SVUI_PanelTemplate_Transparent" virtual="true"> <Attributes> <Attribute name="panelID" type="string" value="transparent" /> - <Attribute name="panelPadding" type="number" value="1" /> + <Attribute name="panelPadding" type="number" value="2" /> <Attribute name="panelColor" type="string" value="transparent" /> <Attribute name="panelGradient" type="boolean" value="false" /> <Attribute name="panelTexUpdate" type="boolean" value="false" /> <Attribute name="panelSkipUpdate" type="boolean" value="true" /> </Attributes> <Backdrop bgFile="Interface\BUTTONS\WHITE8X8" edgeFile="Interface\BUTTONS\WHITE8X8" tile="false"> - <EdgeSize val="1" /> + <EdgeSize val="2" /> <TileSize val="0" /> <BackgroundInsets left="0" right="0" top="0" bottom="0" /> <Color r="0" g="0" b="0" a="0.5" /> diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua index c7e4c6a..4d26725 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/dressup.lua @@ -32,11 +32,12 @@ local function DressUpStyle() return end + DressUpFrame:Size(400, 500) PLUGIN:ApplyWindowStyle(DressUpFrame, true, true) DressUpModel:ClearAllPoints() - DressUpModel:SetPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) - DressUpModel:SetPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36) + DressUpModel:Point("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) + DressUpModel:Point("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36) DressUpModel:SetFixedPanelTemplate("Model") diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua index 84a2f06..ec55578 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua @@ -126,6 +126,7 @@ local function LFDFrameStyle() if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.lfg ~= true then return end PLUGIN:ApplyWindowStyle(PVEFrame, true) + PLUGIN:ApplyWindowStyle(LFGDungeonReadyDialog, true) PVEFrameLeftInset:RemoveTextures() RaidFinderQueueFrame:RemoveTextures(true) @@ -155,8 +156,6 @@ local function LFDFrameStyle() LFGDungeonReadyDialogLeaveQueueButton:SetButtonTemplate() PLUGIN:ApplyCloseButtonStyle(LFGDungeonReadyDialogCloseButton) - LFGDungeonReadyDialog:RemoveTextures() - LFGDungeonReadyDialog:SetPanelTemplate("Pattern", true, 2, 4, 4) LFGDungeonReadyStatus:RemoveTextures() LFGDungeonReadyStatus:SetPanelTemplate("Pattern", true, 2, 4, 4) LFGDungeonReadyDialogRoleIconTexture:SetTexture("Interface\\LFGFrame\\UI-LFG-ICONS-ROLEBACKGROUNDS") diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/transmog.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/transmog.lua index 636e347..4a3189c 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/transmog.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/transmog.lua @@ -60,6 +60,7 @@ TRANSMOG PLUGINR local function TransmogStyle() if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.transmogrify ~= true then return end + TransmogrifyFrame:Size(500, 600) PLUGIN:ApplyWindowStyle(TransmogrifyFrame, true) for p, texture in pairs(TransmogFrameList)do @@ -68,7 +69,11 @@ local function TransmogStyle() select(2, TransmogrifyModelFrame:GetRegions()):Die() + TransmogrifyModelFrame:ClearAllPoints() + TransmogrifyModelFrame:Point("TOPLEFT", TransmogrifyFrame, "TOPLEFT", 12, -22) + TransmogrifyModelFrame:Point("BOTTOMRIGHT", TransmogrifyFrame, "BOTTOMRIGHT", -12, 36) TransmogrifyModelFrame:SetFixedPanelTemplate("Model") + TransmogrifyFrameButtonFrame:GetRegions():Die() TransmogrifyApplyButton:RemoveTextures() TransmogrifyApplyButton:SetButtonTemplate()