diff --git a/SVUI_!Core/setup/presets.lua b/SVUI_!Core/setup/presets.lua
index 5abeeaf..a33c97d 100644
--- a/SVUI_!Core/setup/presets.lua
+++ b/SVUI_!Core/setup/presets.lua
@@ -809,7 +809,6 @@ local function LoadPresetData()
["party"] = {
["wrapXOffset"] = 6,
["wrapYOffset"] = 6,
- ["showBy"] = "RIGHT_DOWN",
["power"] = {
["enable"] = false,
},
diff --git a/SVUI_!Core/system/automations.lua b/SVUI_!Core/system/automations.lua
index cf574cd..47c8a14 100644
--- a/SVUI_!Core/system/automations.lua
+++ b/SVUI_!Core/system/automations.lua
@@ -139,12 +139,8 @@ function SV:VendorGrays(destroy, silent, request)
SV:AddonMessage(L["No gray items to delete."])
end
end
- else
- if(not destroy) then
- SV:AddonMessage(L["No gray items to sell."])
- else
- SV:AddonMessage(L["No gray items to delete."])
- end
+ elseif(destroy) then
+ SV:AddonMessage(L["No gray items to delete."])
end
end
end
diff --git a/SVUI_!Core/xml/styles.xml b/SVUI_!Core/xml/styles.xml
index ceadbcf..a98882c 100644
--- a/SVUI_!Core/xml/styles.xml
+++ b/SVUI_!Core/xml/styles.xml
@@ -281,7 +281,7 @@
<Attribute name="panelTexUpdate" type="boolean" value="false" />
<Attribute name="panelSkipUpdate" type="boolean" value="true" />
</Attributes>
- <Backdrop bgFile="Interface\AddOns\SVUI_!Core\assets\backgrounds\TRANSPARENT" edgeFile="Interface\AddOns\SVUI_!Core\assets\borders\DEFAULT" tile="false">
+ <Backdrop bgFile="Interface\AddOns\SVUI_!Core\assets\backgrounds\DEFAULT" edgeFile="Interface\AddOns\SVUI_!Core\assets\borders\DEFAULT" tile="false">
<EdgeSize val="1" />
<TileSize val="0" />
<BackgroundInsets left="0" right="0" top="0" bottom="0" />
@@ -290,7 +290,7 @@
</Backdrop>
<Layers>
<Layer level="BACKGROUND" textureSubLevel="1">
- <Texture parentKey="Skin" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\backgrounds\TRANSPARENT" setAllPoints="true" />
+ <Texture parentKey="Skin" nonBlocking="true" file="Interface\AddOns\SVUI_!Core\assets\backgrounds\DEFAULT" setAllPoints="true" />
<Color r="0" g="0" b="0" a="0.5" />
</Layer>
</Layers>
diff --git a/SVUI_Skins/components/blizzard/petjournal.lua b/SVUI_Skins/components/blizzard/petjournal.lua
index 1196b10..7c7dd74 100644
--- a/SVUI_Skins/components/blizzard/petjournal.lua
+++ b/SVUI_Skins/components/blizzard/petjournal.lua
@@ -55,6 +55,7 @@ local function PetJournal_UpdatePets()
end
local d = _G["PetJournalListScrollFrameButton"..b]
local e = _G["PetJournalListScrollFrameButton"..b.."Name"]
+ local levelText = _G["PetJournalListScrollFrameButton"..b.."Level"]
local w, x, y, z, level, favorite, A, B, C, D, E, F, G, H, I = C_PetJournal.GetPetInfoByIndex(v, isWild)
if w ~= nil then
local J, K, L, M, N = C_PetJournal.GetPetStats(w)
@@ -83,215 +84,6 @@ end
FRAME MODR
##########################################################
]]--
-local function PetJournalStyle()
- if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.mounts ~= true then return end
-
- SV.API:Set("Window", PetJournalParent)
-
- PetJournalParentPortrait:Hide()
- SV.API:Set("Tab", PetJournalParentTab1)
- SV.API:Set("Tab", PetJournalParentTab2)
- SV.API:Set("CloseButton", PetJournalParentCloseButton)
-
- MountJournal:RemoveTextures()
- MountJournal.LeftInset:RemoveTextures()
- MountJournal.RightInset:RemoveTextures()
- MountJournal.MountDisplay:RemoveTextures()
- MountJournal.MountDisplay.ShadowOverlay:RemoveTextures()
- MountJournal.MountCount:RemoveTextures()
- MountJournalListScrollFrame:RemoveTextures()
- MountJournalMountButton:RemoveTextures()
- MountJournalMountButton:SetStyle("Button")
- MountJournalSearchBox:SetStyle("Editbox")
-
- SV.API:Set("ScrollFrame", MountJournalListScrollFrameScrollBar)
- MountJournal.MountDisplay:SetStyle("!_Frame", "Model")
-
- local buttons = MountJournal.ListScrollFrame.buttons
- for i = 1, #buttons do
- local button = buttons[i]
- if(button) then
- SV.API:Set("ItemButton", button, nil, true, true)
- local bar = _G["SVUI_MountSelectBar"..i]
- if(bar) then bar:SetParent(button.Panel) end
- if(button.favorite) then
- local fg = CreateFrame("Frame", nil, button)
- fg:SetAllPoints(favorite)
- fg:SetFrameLevel(button:GetFrameLevel() + 30)
- button.favorite:SetParent(fg)
- button.favorite:SetTexture(SV.media.icon.star)
- end
- end
- end
-
- hooksecurefunc("MountJournal_UpdateMountList", PetJournal_UpdateMounts)
- MountJournalListScrollFrame:HookScript("OnVerticalScroll", PetJournal_UpdateMounts)
- MountJournalListScrollFrame:HookScript("OnMouseWheel", PetJournal_UpdateMounts)
- PetJournalSummonButton:RemoveTextures()
- PetJournalFindBattle:RemoveTextures()
- PetJournalSummonButton:SetStyle("Button")
- PetJournalFindBattle:SetStyle("Button")
- PetJournalRightInset:RemoveTextures()
- PetJournalLeftInset:RemoveTextures()
-
- for i = 1, 3 do
- local button = _G["PetJournalLoadoutPet" .. i .. "HelpFrame"]
- button:RemoveTextures()
- end
-
- PetJournalTutorialButton:Die()
- PetJournal.PetCount:RemoveTextures()
- PetJournalSearchBox:SetStyle("Editbox")
- PetJournalFilterButton:RemoveTextures(true)
- PetJournalFilterButton:SetStyle("Button")
- PetJournalListScrollFrame:RemoveTextures()
- SV.API:Set("ScrollFrame", PetJournalListScrollFrameScrollBar)
-
- for i = 1, #PetJournal.listScroll.buttons do
- local button = _G["PetJournalListScrollFrameButton" .. i]
- local favorite = _G["PetJournalListScrollFrameButton" .. i .. "Favorite"]
- SV.API:Set("ItemButton", button, false, true)
- if(favorite) then
- local fg = CreateFrame("Frame", nil, button)
- fg:SetAllPoints(favorite)
- fg:SetFrameLevel(button:GetFrameLevel() + 30)
- favorite:SetParent(fg)
- button.dragButton.favorite:SetParent(fg)
- favorite:SetTexture(SV.media.icon.star)
- favorite:SetTexCoord(0,1,0,1)
- end
-
- button.dragButton.levelBG:SetAlpha(0)
- button.dragButton.level:SetParent(button)
- button.petTypeIcon:SetParent(button.Panel)
- end
-
- hooksecurefunc('PetJournal_UpdatePetList', PetJournal_UpdatePets)
- PetJournalListScrollFrame:HookScript("OnVerticalScroll", PetJournal_UpdatePets)
- PetJournalListScrollFrame:HookScript("OnMouseWheel", PetJournal_UpdatePets)
- PetJournalAchievementStatus:DisableDrawLayer('BACKGROUND')
- SV.API:Set("ItemButton", PetJournalHealPetButton, true)
- PetJournalHealPetButton.texture:SetTexture([[Interface\Icons\spell_magic_polymorphrabbit]])
- PetJournalLoadoutBorder:RemoveTextures()
-
- for b = 1, 3 do
- local pjPet = _G['PetJournalLoadoutPet'..b]
- pjPet:RemoveTextures()
- pjPet.petTypeIcon:SetPoint('BOTTOMLEFT', 2, 2)
- pjPet.dragButton:WrapPoints(_G['PetJournalLoadoutPet'..b..'Icon'])
- pjPet.hover = true;
- pjPet.pushed = true;
- pjPet.checked = true;
- SV.API:Set("ItemButton", pjPet, nil, nil, true)
- pjPet.setButton:RemoveTextures()
- _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:RemoveTextures()
- _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:SetStyle("Frame", 'Default')
- _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:SetStatusBarTexture(SV.media.statusbar.default)
- _G['PetJournalLoadoutPet'..b..'XPBar']:RemoveTextures()
- _G['PetJournalLoadoutPet'..b..'XPBar']:SetStyle("Frame", 'Default')
- _G['PetJournalLoadoutPet'..b..'XPBar']:SetStatusBarTexture(SV.media.statusbar.default)
- _G['PetJournalLoadoutPet'..b..'XPBar']:SetFrameLevel(_G['PetJournalLoadoutPet'..b..'XPBar']:GetFrameLevel()+2)
- for v = 1, 3 do
- local s = _G['PetJournalLoadoutPet'..b..'Spell'..v]
- SV.API:Set("ItemButton", s)
- s.FlyoutArrow:SetTexture([[Interface\Buttons\ActionBarFlyoutButton]])
- _G['PetJournalLoadoutPet'..b..'Spell'..v..'Icon']:InsetPoints(s)
- s.Panel:SetFrameLevel(s:GetFrameLevel() + 1)
- _G['PetJournalLoadoutPet'..b..'Spell'..v..'Icon']:SetParent(s.Panel)
- end
- end
-
- PetJournalSpellSelect:RemoveTextures()
-
- for b = 1, 2 do
- local Q = _G['PetJournalSpellSelectSpell'..b]
- SV.API:Set("ItemButton", Q)
- _G['PetJournalSpellSelectSpell'..b..'Icon']:InsetPoints(Q)
- _G['PetJournalSpellSelectSpell'..b..'Icon']:SetDrawLayer('BORDER')
- end
-
- PetJournalPetCard:RemoveTextures()
- SV.API:Set("ItemButton", PetJournalPetCard, nil, nil, true)
- PetJournalPetCardInset:RemoveTextures()
- PetJournalPetCardPetInfo.levelBG:SetAlpha(0)
- PetJournalPetCardPetInfoIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS))
- SV.API:Set("ItemButton", PetJournalPetCardPetInfo, nil, true, true)
-
- local fg = CreateFrame("Frame", nil, PetJournalPetCardPetInfo)
- fg:SetSize(40,40)
- fg:SetPoint("TOPLEFT", PetJournalPetCardPetInfo, "TOPLEFT", -1, 1)
- fg:SetFrameLevel(PetJournalPetCardPetInfo:GetFrameLevel() + 30)
-
- PetJournalPetCardPetInfo.favorite:SetParent(fg)
- PetJournalPetCardPetInfo.Panel:WrapPoints(PetJournalPetCardPetInfoIcon)
- PetJournalPetCardPetInfoIcon:SetParent(PetJournalPetCardPetInfo.Panel)
- PetJournalPetCardPetInfo.level:SetParent(PetJournalPetCardPetInfo.Panel)
-
- local R = PetJournalPrimaryAbilityTooltip;R.Background:SetTexture("")
- if R.Delimiter1 then
- R.Delimiter1:SetTexture("")
- R.Delimiter2:SetTexture("")
- end
-
- R.BorderTop:SetTexture("")
- R.BorderTopLeft:SetTexture("")
- R.BorderTopRight:SetTexture("")
- R.BorderLeft:SetTexture("")
- R.BorderRight:SetTexture("")
- R.BorderBottom:SetTexture("")
- R.BorderBottomRight:SetTexture("")
- R.BorderBottomLeft:SetTexture("")
- R:SetStyle("!_Frame", "Transparent", true)
-
- for b = 1, 6 do
- local S = _G['PetJournalPetCardSpell'..b]
- S:SetFrameLevel(S:GetFrameLevel() + 2)
- S:DisableDrawLayer('BACKGROUND')
- S:SetStyle("Frame", 'Transparent')
- S.Panel:SetAllPoints()
- S.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS))
- S.icon:InsetPoints(S.Panel)
- end
-
- PetJournalPetCardHealthFrame.healthBar:RemoveTextures()
- PetJournalPetCardHealthFrame.healthBar:SetStyle("Frame", 'Default')
- PetJournalPetCardHealthFrame.healthBar:SetStatusBarTexture(SV.media.statusbar.default)
- PetJournalPetCardXPBar:RemoveTextures()
- PetJournalPetCardXPBar:SetStyle("Frame", 'Default')
- PetJournalPetCardXPBar:SetStatusBarTexture(SV.media.statusbar.default)
-
- SV.API:Set("Tab", PetJournalParentTab3)
-
- ToyBox:RemoveTextures()
- ToyBoxSearchBox:SetStyle("Editbox")
- ToyBoxFilterButton:RemoveTextures()
- ToyBoxFilterButton:SetStyle("Button")
- ToyBoxIconsFrame:RemoveTextures()
- ToyBoxIconsFrame:SetStyle("!_Frame", 'Model')
-
- ToyBoxProgressBar:RemoveTextures()
- ToyBoxProgressBar:SetStatusBarTexture([[Interface\BUTTONS\WHITE8X8]])
- ToyBoxProgressBar:SetStyle("Frame", "Bar", true, 2, 2, 2)
- SV.API:Set("PageButton", ToyBoxNextPageButton)
- SV.API:Set("PageButton", ToyBoxPrevPageButton)
-
- MountJournalFilterButton:RemoveTextures()
- MountJournalFilterButton:SetStyle("Button")
-
- MountJournal.SummonRandomFavoriteButton:RemoveTextures()
- MountJournal.SummonRandomFavoriteButton:SetStyle("ActionSlot")
- MountJournal.SummonRandomFavoriteButton.texture:SetTexture([[Interface\ICONS\ACHIEVEMENT_GUILDPERK_MOUNTUP]])
- MountJournal.SummonRandomFavoriteButton.texture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS))
-
- for i = 1, 18 do
- local gName = ("ToySpellButton%d"):format(i)
- local button = _G[gName]
- if(button) then
- button:SetStyle("Button")
- end
- end
-end
-
local function CollectionsJournalStyle()
if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.mounts ~= true then return end
@@ -360,18 +152,22 @@ local function CollectionsJournalStyle()
local button = _G["PetJournalListScrollFrameButton" .. i]
local favorite = _G["PetJournalListScrollFrameButton" .. i .. "Favorite"]
SV.API:Set("ItemButton", button, false, true)
- if(favorite) then
+ if(not button.Riser) then
local fg = CreateFrame("Frame", nil, button)
- fg:SetAllPoints(favorite)
+ fg:SetAllPoints(button)
fg:SetFrameLevel(button:GetFrameLevel() + 30)
- favorite:SetParent(fg)
- button.dragButton.favorite:SetParent(fg)
+ button.Riser = fg
+ end
+ if(favorite) then
+ favorite:SetParent(button.Riser)
+ button.dragButton.favorite:SetParent(button.Riser)
favorite:SetTexture(SV.media.icon.star)
favorite:SetTexCoord(0,1,0,1)
end
button.dragButton.levelBG:SetAlpha(0)
- button.dragButton.level:SetParent(button)
+ button.dragButton.level:SetParent(button.Riser)
+ --button.dragButton.level:SetDrawLayer("OVERLAY", 7)
button.petTypeIcon:SetParent(button.Panel)
end
@@ -518,5 +314,4 @@ end
MOD LOADING
##########################################################
]]--
-MOD:SaveBlizzardStyle("Blizzard_PetJournal", PetJournalStyle)
MOD:SaveBlizzardStyle("Blizzard_Collections", CollectionsJournalStyle)
\ No newline at end of file
diff --git a/SVUI_UnitFrames/elements/essentials.lua b/SVUI_UnitFrames/elements/essentials.lua
index c1b04ed..7342928 100644
--- a/SVUI_UnitFrames/elements/essentials.lua
+++ b/SVUI_UnitFrames/elements/essentials.lua
@@ -706,13 +706,16 @@ function MOD:PostUpdatePower(unit, value, max)
if isPlayer and self.colorClass then
local _, class = UnitClassBase(unit);
colors = oUF_SVUI["colors"].class[class]
- elseif not isPlayer then
- local react = UnitReaction("player", unit)
- colors = oUF_SVUI["colors"].reaction[react]
+ elseif(not isPlayer and (powerType and powerType == 1 and value == 0)) then
+ colors = nil
end
- if not colors then return end
- self:SetStatusBarColor(colors[1], colors[2], colors[3])
- self.bg:SetVertexColor(colors[1] * mult, colors[2] * mult, colors[3] * mult)
+ if(not colors) then
+ self:Hide()
+ else
+ if(not self:IsShown()) then self:Show() end
+ self:SetStatusBarColor(colors[1], colors[2], colors[3])
+ self.bg:SetVertexColor(colors[1] * mult, colors[2] * mult, colors[3] * mult)
+ end
end
--[[
##########################################################