Quantcast

5.0.32

Steven Jackson [10-15-14 - 05:45]
5.0.32
Filename
Interface/AddOns/SVUI/packages/unit/frames.lua
Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua
Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua
Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua
diff --git a/Interface/AddOns/SVUI/packages/unit/frames.lua b/Interface/AddOns/SVUI/packages/unit/frames.lua
index ae7022d..1b793df 100644
--- a/Interface/AddOns/SVUI/packages/unit/frames.lua
+++ b/Interface/AddOns/SVUI/packages/unit/frames.lua
@@ -1122,14 +1122,18 @@ local Raid10Visibility = function(self, event)
     if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
-    local _, _, _, _, maxPlayers, _, _ = GetInstanceInfo()
+    local _, _, _, raidType, _, _, isDynamic, _, maxPlayers = GetInstanceInfo()
     if(event == "PLAYER_REGEN_ENABLED") then
         self:UnregisterEvent("PLAYER_REGEN_ENABLED")
     end
     if not InCombatLockdown() then
-        if(instance and (instanceType == "raid") and (maxPlayers == 10)) then
+        if(instance and (instanceType == "raid" or instanceType == "pvp") and (maxPlayers == 10)) then
             UnregisterStateDriver(self, "visibility")
-            self:Show()
+            if(raidType == 'Mythic') then
+                self:Hide()
+            else
+                self:Show()
+            end
         elseif(instance and (instanceType == "raid")) then
             UnregisterStateDriver(self, "visibility")
             self:Hide()
@@ -1147,14 +1151,18 @@ local Raid25Visibility = function(self, event)
     if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
-    local _, _, _, _, maxPlayers, _, _ = GetInstanceInfo()
+    local _, _, _, raidType, _, _, isDynamic, _, maxPlayers = GetInstanceInfo()
     if event == "PLAYER_REGEN_ENABLED"then
         self:UnregisterEvent("PLAYER_REGEN_ENABLED")
     end
     if not InCombatLockdown()then
-        if(instance and (instanceType == "raid") and (maxPlayers == 25)) then
+        if(instance and (instanceType == "raid" or instanceType == "pvp") and (maxPlayers == 25)) then
             UnregisterStateDriver(self, "visibility")
-            self:Show()
+            if(raidType == 'Mythic') then
+                self:Hide()
+            else
+                self:Show()
+            end
         elseif(instance and (instanceType == "raid")) then
             UnregisterStateDriver(self, "visibility")
             self:Hide()
@@ -1172,14 +1180,18 @@ local Raid40Visibility = function(self, event)
     if (not db or (db and not db.enable) or (SV.db.SVUnit and not SV.db.SVUnit.smartRaidFilter) or self.isForced) then return end

     local instance, instanceType = IsInInstance()
-    local _, _, _, _, maxPlayers, _, _ = GetInstanceInfo()
+    local _, _, _, raidType, _, _, isDynamic, _, maxPlayers = GetInstanceInfo()
     if event == "PLAYER_REGEN_ENABLED"then
         self:UnregisterEvent("PLAYER_REGEN_ENABLED")
     end
     if not InCombatLockdown()then
-        if(instance and (instanceType == "raid") and (maxPlayers == 40)) then
+        if(instance and (instanceType == "raid" or instanceType == "pvp") and (maxPlayers == 40)) then
             UnregisterStateDriver(self, "visibility")
-            self:Show()
+            if(raidType == 'Mythic') then
+                self:Hide()
+            else
+                self:Show()
+            end
         elseif(instance and (instanceType == "raid")) then
             UnregisterStateDriver(self, "visibility")
             self:Hide()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua
index c5b0e72..f5c07ea 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/auctionhouse.lua
@@ -189,8 +189,8 @@ local function AuctionStyle()
 	BrowseNoResultsText:SetParent(AuctionFrameBrowse.bg1)
 	BrowseSearchCountText:SetParent(AuctionFrameBrowse.bg1)

-	BrowseResetButton:Point("TOPLEFT", AuctionFrameBrowse, "TOPLEFT", 81, -74)
 	BrowseSearchButton:Point("TOPRIGHT", AuctionFrameBrowse, "TOPRIGHT", 25, -34)
+	BrowseResetButton:Point("TOPRIGHT", BrowseSearchButton, "TOPLEFT", -4, 0)

 	AuctionFrameBrowse.bg1:SetFrameLevel(AuctionFrameBrowse.bg1:GetFrameLevel()-1)
 	BrowseFilterScrollFrame:Height(300)
diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua
index b794649..a6fec9e 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/lfd.lua
@@ -107,7 +107,10 @@ local ScenarioQueueRandom_OnUpdate = function()
         t.restyled = true
       end
     end
-  end
+  end
+  LFDQueueFrameRandomScrollFrameChildFrameMoneyReward:RemoveTextures()
+  RaidFinderQueueFrameScrollFrameChildFrameMoneyReward:RemoveTextures()
+  ScenarioQueueFrameRandomScrollFrameChildFrameMoneyReward:RemoveTextures()
 end
 --[[
 ##########################################################
@@ -310,6 +313,9 @@ local function LFDFrameStyle()
     end
   end

+  RaidFinderQueueFrameScrollFrameChildFrameMoneyReward:RemoveTextures()
+
+
   ScenarioFinderFrameInset:DisableDrawLayer("BORDER")
   ScenarioFinderFrame.TopTileStreaks:Hide()
   ScenarioFinderFrameBtnCornerRight:Hide()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua
index 7646504..b0248a2 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/pvp.lua
@@ -59,7 +59,7 @@ local function PVPFrameStyle()
 		STYLE:ApplyTabStyle(_G["PVPUIFrameTab"..g])
 	end

-	for i = 1, 3 do
+	for i = 1, 4 do
 		local btn = _G["PVPQueueFrameCategoryButton"..i]
 		if(btn) then
 			btn.Background:Die()