diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index bc530ec..0e66e0b 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Core|r ## Notes: SVUI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global, SVUI_Errors, SVUI_Filters, SVUI_Media diff --git a/SVUI_!Core/system/dock.lua b/SVUI_!Core/system/dock.lua index 949553c..045bf2f 100644 --- a/SVUI_!Core/system/dock.lua +++ b/SVUI_!Core/system/dock.lua @@ -59,7 +59,7 @@ SV.SpecialFX:Register("dragging_highlight_top", [[Spells\Creature_spellportal_bl SV.SpecialFX:Register("dragging_highlight_bottom", [[Spells\Creature_spellportal_blue_clickable.m2]], 0, 80, 0, 0, 0.9, 0, -0.25) local ToggleDraggingMode; -local DOCK_CHECK, DRAG_LASTINDEX, DRAG_ORDERINDEX, DRAG_TARGETBAR, DRAG_BUTTONWIDTH; +local DOCK_CHECK, DRAG_LASTINDEX, DRAG_ORDERINDEX, DRAG_TARGETBAR, DRAG_BUTTONWIDTH, DRAG_ENABLED; local ORDER_TEMP, ORDER_TEST, DOCK_REGISTRY, DOCK_DROPDOWN_OPTIONS = {}, {}, {}, {}; local DOCK_LOCATIONS = { ["BottomLeft"] = {1, "LEFT", true, "ANCHOR_TOPLEFT"}, @@ -1070,6 +1070,9 @@ local DockBar_AddButton = function(self, button, order) frame:SetParent(self.Parent.Window) frame:InsetPoints(self.Parent.Window) frame.Parent = self.Parent + if(frame.UpdateBackdrop) then + frame:UpdateBackdrop(); + end frame:FadeIn() if(not MOD.private.Active[currentLocation]) then DockBar_SetDefault(self, button) @@ -1106,6 +1109,9 @@ local DockBar_RemoveButton = function(self, button, isMoving) if(button.FrameLink) then local frameName = button.FrameLink:GetName() MOD.private.Windows[frameName] = nil; + if(button.FrameLink.UpdateBackdrop) then + button.FrameLink:UpdateBackdrop(); + end button.FrameLink:FadeOut(0.2, 1, 0, true); self.Data.Windows[frameName] = nil; end @@ -1172,38 +1178,41 @@ local DockButton_OnDragStart = function(self) DRAG_LASTINDEX = self.OrderIndex; DRAG_BUTTONWIDTH = self:GetWidth() ToggleDraggingMode(true); + DRAG_ENABLED = true; end end local DockButton_OnDragStop = function(self) - self:StopMovingOrSizing(); - ToggleDraggingMode(false); - - local name = self:GetName(); - local previous = MOD.private.Locations[name]; - self.OrderIndex = 0; - if((not DRAG_TARGETBAR) and self.CanFloat) then - SetFloatingDock(self) - else - --print(name .. ' Docked') - local target = DRAG_TARGETBAR; - if(not target) then - target = MOD[previous]; - end - self:SetMovable(false); - self.isFloating = nil; - MOD.private.Locations[name] = nil; - if(self.FrameLink) then - self.FrameLink:SetResizable(false); - self.FrameLink.resize:Hide(); - end + if(DRAG_ENABLED) then + self:StopMovingOrSizing(); + ToggleDraggingMode(false); + local name = self:GetName(); + local previous = MOD.private.Locations[name]; + self.OrderIndex = 0; + if((not DRAG_TARGETBAR) and self.CanFloat) then + SetFloatingDock(self) + else + --print(name .. ' Docked') + local target = DRAG_TARGETBAR; + if(not target) then + target = MOD[previous]; + end + self:SetMovable(false); + self.isFloating = nil; + MOD.private.Locations[name] = nil; + if(self.FrameLink) then + self.FrameLink:SetResizable(false); + self.FrameLink.resize:Hide(); + end - target:Add(self, DRAG_ORDERINDEX); - SV.Events:Trigger("DOCKLET_MOVED", self.LocationKey); - end + target:Add(self, DRAG_ORDERINDEX); + SV.Events:Trigger("DOCKLET_MOVED", self.LocationKey); + end - if(self.FrameLink and self.FrameLink.UpdateBackdrop) then - self.FrameLink:UpdateBackdrop() + if(self.FrameLink and self.FrameLink.UpdateBackdrop) then + self.FrameLink:UpdateBackdrop() + end + DRAG_ENABLED = false; end end diff --git a/SVUI_!Core/system/layout.lua b/SVUI_!Core/system/layout.lua index 8f494aa..cb39515 100644 --- a/SVUI_!Core/system/layout.lua +++ b/SVUI_!Core/system/layout.lua @@ -1257,7 +1257,7 @@ local function InitializeMovables() bottom = 0, }, }); - CLOAKED_BG:SetBackdropColor(0,0,0,0.8); + CLOAKED_BG:SetBackdropColor(0,0,0,0.5); Layout.Anchors = SV.db.LAYOUT or {} --Layout:SetPanelColor("yellow") diff --git a/SVUI_!Core/system/media.lua b/SVUI_!Core/system/media.lua index 6d3259f..730c24f 100644 --- a/SVUI_!Core/system/media.lua +++ b/SVUI_!Core/system/media.lua @@ -257,8 +257,8 @@ do ["special"] = {0.37, 0.32, 0.29, 1}, ["specialdark"] = {.23, .22, .21, 1}, ["unique"] = {0.32, 0.258, 0.21, 1}, - ["paper"] = {0.37, 0.32, 0.29, 1}, - ["dusty"] = {.28, .27, .26, 1}, + ["paper"] = {0.77, 0.72, 0.69, 1}, + ["dusty"] = {.28, .27, .26, 1}, ["class"] = {r1, g1, b1, 1}, ["bizzaro"] = {ir1, ig1, ib1, 1}, ["medium"] = {0.47, 0.47, 0.47}, @@ -290,7 +290,7 @@ do ["secondary"] = {"VERTICAL", 0.08, 0.08, 0.08, 0.22, 0.22, 0.22}, ["special"] = {"VERTICAL", 0.33, 0.25, 0.13, 0.47, 0.39, 0.27}, ["specialdark"] = {"VERTICAL", 0.23, 0.15, 0.03, 0.33, 0.25, 0.13}, - ["paper"] = {"VERTICAL", 0.33, 0.25, 0.13, 0.47, 0.39, 0.27}, + ["paper"] = {"VERTICAL", 0.53, 0.45, 0.33, 0.77, 0.72, 0.69}, ["dusty"] = {"VERTICAL", 0.12, 0.11, 0.1, 0.22, 0.21, 0.2}, ["class"] = {"VERTICAL", r2, g2, b2, r1, g1, b1}, ["bizzaro"] = {"VERTICAL", ir2, ig2, ib2, ir1, ig1, ib1}, diff --git a/SVUI_!Options/SVUI_!Options.toc b/SVUI_!Options/SVUI_!Options.toc index bd847cc..e6024dd 100644 --- a/SVUI_!Options/SVUI_!Options.toc +++ b/SVUI_!Options/SVUI_!Options.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Options|r ## Notes: SVUI [|cff9911FFConfig Options|r] ## RequiredDeps: SVUI_!Core diff --git a/SVUI_ActionBars/SVUI_ActionBars.toc b/SVUI_ActionBars/SVUI_ActionBars.toc index 52748b9..36818e0 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.toc +++ b/SVUI_ActionBars/SVUI_ActionBars.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Action Bars|r ## Notes: Action Bar Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0, LibActionButton-1.0 diff --git a/SVUI_Auras/SVUI_Auras.toc b/SVUI_Auras/SVUI_Auras.toc index 72cca90..b9dfb6f 100644 --- a/SVUI_Auras/SVUI_Auras.toc +++ b/SVUI_Auras/SVUI_Auras.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Auras|r ## Notes: Aura Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Chat/SVUI_Chat.lua b/SVUI_Chat/SVUI_Chat.lua index 7dfb786..8d453e8 100644 --- a/SVUI_Chat/SVUI_Chat.lua +++ b/SVUI_Chat/SVUI_Chat.lua @@ -969,6 +969,13 @@ do end end + local _forced_SetAllPoints = function(self, parent) + if(self.Dock and (parent ~= self.Dock)) then + self:ClearAllPoints() + self:SetAllPoints(self.Dock) + end + end + function MOD:RefreshChatFrames(event, forced) --print(event) if ((not forced) and (refreshLocked and (IsMouseButtonDown("LeftButton") or InCombatLockdown()))) then return; end @@ -983,8 +990,18 @@ do ConfigChatFrame(chat) end - local CHAT_WIDTH, CHAT_HEIGHT = chat.Dock:GetSize(); --FCF_SetLocked(chat, true); + + --/script print(ChatFrame1:GetLeft()) + --/script print(ChatFrame11:GetLeft()) + --/script local a1,p,a2,x,y = ChatFrame1.Dock:GetPoint(); print(p:GetName())print(a1..' '..a2..' '..x..' '..y) + --/script local a1,p,a2,x,y = ChatFrame11.Dock:GetPoint(); print(p:GetName())print(a1..' '..a2..' '..x..' '..y) + + --/script ChatFrame11:SetBackdrop({bgFile = [[Interface\AddOns\SVUI_!Core\assets\backgrounds\DEFAULT]]}) + --/script ChatFrame11:ClearAllPoints() + --/script ChatFrame11:SetAllPoints(ChatFrame11.Dock) + --/script ChatFrame11.Dock:ClearAllPoints() + --/script ChatFrame11.Dock:SetAllPoints(ChatFrame1.Dock) chat:SetBackdrop({ bgFile = [[Interface\AddOns\SVUI_!Core\assets\textures\EMPTY]], tile = false, @@ -1002,12 +1019,11 @@ do chat:SetBackdropColor(0,0,0,0); chat:SetBackdropBorderColor(0,0,0,0); - chat:ClearAllPoints(); - chat:SetAllPoints(chat.Dock); -- chat:SetPoint("TOPLEFT", chat.Dock, "TOPLEFT", 0, 0); -- chat:SetPoint("BOTTOMLEFT", chat.Dock, "BOTTOMLEFT", 0, 0); -- chat:SetPoint("TOPRIGHT", chat.Dock, "TOPRIGHT", 0, 0); -- chat:SetPoint("BOTTOMRIGHT", chat.Dock, "BOTTOMRIGHT", 0, 0); + --local CHAT_WIDTH, CHAT_HEIGHT = chat.Dock:GetSize(); --chat:SetSize(CHAT_WIDTH - 4, CHAT_HEIGHT - 4); --FCF_SavePositionAndDimensions(chat) @@ -1032,7 +1048,6 @@ do end if(not chat.hookedHyperLinks) then - --NewHook(chat, "SetPoint", _forced_SetPoint) chat:HookScript('OnHyperlinkEnter', _hook_OnHyperlinkEnter) chat:HookScript('OnHyperlinkLeave', _hook_OnHyperlinkLeave) chat:HookScript('OnMessageScrollChanged', _hook_OnMessageScrollChanged) @@ -1045,12 +1060,14 @@ do chat.isDocked = nil; chat.hasBeenFaded = nil; chat.isUninteractable = true; - SetChatWindowLocked(i, true); chat.oldAlpha = 0; --FCF_FadeInChatFrame(chat); local dockingKey = chat.Dock:GetName() - SetChatWindowUninteractable(i, false) chat.Dock.Button:SetDocked(MOD.private.activeTabs[dockingKey]) + chat:ClearAllPoints(); + chat:SetAllPoints(chat.Dock); + FCF_SetLocked(chat, true); + SetChatWindowUninteractable(i, false); end -- for name,isset in pairs(MOD.private.activeTabs) do @@ -1076,7 +1093,7 @@ local function OpenNewSVUIChatFrame(newname) newname = format(CHAT_NAME_TEMPLATE, i); end FCF_SetWindowName(chatFrame, newname); - FCF_SetLocked(chatFrame, true); + FCF_SetLocked(chatFrame, false); -- clear stale messages chatFrame:Clear(); @@ -1506,8 +1523,6 @@ do if(frame.Dock) then frame.oldAlpha = 0; frame.Dock:UpdateBackdrop(); - frame:ClearAllPoints(); - frame:SetAllPoints(frame.Dock); end; break; end @@ -1548,8 +1563,10 @@ do NewHook('FCF_StartAlertFlash', _hook_FCFStartAlertFlash) NewHook('FCF_StopAlertFlash', _hook_FCFStopAlertFlash) NewHook('FCF_OpenNewWindow', OpenNewSVUIChatFrame) + --NewHook('FCFDock_AddChatFrame', OpenNewSVUIChatFrame) NewHook('FCF_UnDockFrame', MOD.RefreshChatFrames) NewHook('FCF_DockFrame', MOD.RefreshChatFrames) + --NewHook('FCF_DockUpdate', MOD.RefreshChatFrames) NewHook('FCF_OpenTemporaryWindow', _hook_FCF_OpenTemporaryWindow) NewHook('ChatEdit_OnEnterPressed', _hook_ChatEditOnEnterKey) NewHook('FCF_SetChatWindowFontSize', _hook_ChatFontUpdate) diff --git a/SVUI_Chat/SVUI_Chat.toc b/SVUI_Chat/SVUI_Chat.toc index 382be50..ce44f5f 100644 --- a/SVUI_Chat/SVUI_Chat.toc +++ b/SVUI_Chat/SVUI_Chat.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Chat|r ## Notes: Chat Plugin for [|cff9911FFSVUI|r]. ## SavedVariablesPerCharacter: SVUI_Private_ChatCache diff --git a/SVUI_Inventory/SVUI_Inventory.toc b/SVUI_Inventory/SVUI_Inventory.toc index e193910..5d250bc 100644 --- a/SVUI_Inventory/SVUI_Inventory.toc +++ b/SVUI_Inventory/SVUI_Inventory.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Inventory|r ## Notes: Inventory Plugin for [|cff9911FFSVUI|r]. ## SavedVariables: SVUI_LootCache diff --git a/SVUI_Maps/SVUI_Maps.toc b/SVUI_Maps/SVUI_Maps.toc index 403b165..7feb412 100644 --- a/SVUI_Maps/SVUI_Maps.toc +++ b/SVUI_Maps/SVUI_Maps.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Maps|r ## Notes: Maps Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_NamePlates/SVUI_NamePlates.toc b/SVUI_NamePlates/SVUI_NamePlates.toc index 8b1753f..47b2011 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.toc +++ b/SVUI_NamePlates/SVUI_NamePlates.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00NamePlates|r ## Notes: NamePlates Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.toc b/SVUI_QuestTracker/SVUI_QuestTracker.toc index 9071de2..bed078c 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.toc +++ b/SVUI_QuestTracker/SVUI_QuestTracker.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00QuestTracker|r ## Notes: QuestTracker Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Skins/SVUI_Skins.toc b/SVUI_Skins/SVUI_Skins.toc index 7255036..4f977bd 100644 --- a/SVUI_Skins/SVUI_Skins.toc +++ b/SVUI_Skins/SVUI_Skins.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch, Azilroka, Sortokk -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Skins|r ## Notes: SVUI [|cff9911FFSkins System and AddOn Frames|r]. ## SavedVariables: SVUIUI_STYLE_GLOBAL diff --git a/SVUI_Tooltip/SVUI_Tooltip.toc b/SVUI_Tooltip/SVUI_Tooltip.toc index 3d0b156..56eef6f 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.toc +++ b/SVUI_Tooltip/SVUI_Tooltip.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Tooltip|r ## Notes: Tooltip Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.toc b/SVUI_UnitFrames/SVUI_UnitFrames.toc index a80f93c..89639c3 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.toc +++ b/SVUI_UnitFrames/SVUI_UnitFrames.toc @@ -1,6 +1,6 @@ ## Interface: 60200 ## Author: Munglunch -## Version: 1.2.3 +## Version: 1.2.4 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00UnitFrames|r ## Notes: UnitFrames Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0