[wrath] Fix mail frame

Fixes #89
Gethe · Mar 18, 2023 · 8879a09 · 8879a09
1 parent 1634095
commit 8879a09
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Skin/Classic/Interface/FrameXML/ContainerFrame.lua b/Skin/Classic/Interface/FrameXML/ContainerFrame.lua
@@ -41,7 +41,7 @@ do --[[ FrameXML\ContainerFrame.lua ]]
             local slotID, _ = itemButton:GetID()
             local quality, link
             if private.isClassic then
-                _, _, _, quality, _, _, link = _G.C_Container.GetContainerItemInfo(bagID, slotID)
+                _, _, _, quality, _, _, link = _G.GetContainerItemInfo(bagID, slotID)
             else
                 local info = _G.C_Container.GetContainerItemInfo(bagID, slotID);
                 quality = info and info.quality;

diff --git a/Skin/Classic/Interface/FrameXML/ItemButtonTemplate.lua b/Skin/Classic/Interface/FrameXML/ItemButtonTemplate.lua
@@ -44,7 +44,11 @@ do --[[ FrameXML\ItemButtonTemplate.xml ]]
         Button.icon:SetPoint("TOPLEFT", bg, 1, -1)
         Button.icon:SetPoint("BOTTOMRIGHT", bg, -1, 1)
 
-        Button:SetNormalTexture("")
+        if private.isClassic then
+            Button:SetNormalTexture("")
+        else
+            Button:ClearNormalTexture()
+        end
         Base.CropIcon(Button:GetPushedTexture())
         Base.CropIcon(Button:GetHighlightTexture())
     end

diff --git a/Skin/Classic/Interface/FrameXML/MailFrame.lua b/Skin/Classic/Interface/FrameXML/MailFrame.lua
@@ -263,6 +263,9 @@ function private.FrameXML.MailFrame()
 
     local MailEditBox = _G.MailEditBox
     Skin.ScrollingEditBoxTemplate(MailEditBox)
+    if private.isWrath then
+        MailEditBox:SetTextColor(Color.grayLight)
+    end
     MailEditBox:SetPoint("TOPLEFT", 10, -83)
     MailEditBox:SetWidth(298)
 
@@ -339,12 +342,6 @@ function private.FrameXML.MailFrame()
     _G.OpenStationeryBackgroundLeft:Hide()
     _G.OpenStationeryBackgroundRight:Hide()
 
-    local openScrollBG = _G.CreateFrame("Frame", nil, _G.OpenMailScrollFrame)
-    openScrollBG:SetFrameLevel(_G.OpenMailScrollFrame:GetFrameLevel() - 1)
-    openScrollBG:SetPoint("TOPLEFT", 0, 2)
-    openScrollBG:SetPoint("BOTTOMRIGHT", 20, -2)
-    Base.SetBackdrop(openScrollBG, Color.frame)
-
     _G.OpenMailScrollChildFrame:SetSize(298, 257)
     _G.OpenMailBodyText:SetPoint("TOPLEFT", 2, -2)
     _G.OpenMailBodyText:SetWidth(298)