From f02f6d267e4fb282ba130ab7a725431a48ac83a6 Mon Sep 17 00:00:00 2001
From: shagu <ericmauser@googlemail.com>
Date: Sun, 10 Mar 2019 14:54:48 +0100
Subject: [PATCH] skin: less borders for icon buttons

---
 skins/blizzard/gossipquest.lua | 36 ++++++++++++++++++++--------------
 skins/blizzard/merchant.lua    |  9 +++++++--
 skins/blizzard/questlog.lua    | 22 ++++++++++++++++-----
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/skins/blizzard/gossipquest.lua b/skins/blizzard/gossipquest.lua
index bd5c1c70..10b5eaac 100644
--- a/skins/blizzard/gossipquest.lua
+++ b/skins/blizzard/gossipquest.lua
@@ -20,21 +20,34 @@ pfUI:RegisterSkin("Gossip and Quest", function ()
 
     for _, name in pairs({ "QuestProgressItem", "QuestDetailItem" }) do
       for i = 1, 6 do
-        local item = _G[name..i]
-        local icon = _G[name..i.."IconTexture"]
-        local count = _G[name..i.."Count"]
-        local xsize = item:GetWidth() - 10
-        local ysize = item:GetHeight() - 10
+        local name = name .. i
+        local item = _G[name]
+        local icon = _G[name.."IconTexture"]
+        local count = _G[name.."Count"]
+        local title = _G[name.."Name"]
+
+        local xsize = item:GetWidth() -12
+        local ysize = item:GetHeight() -12
 
-        StripTextures(item)
-        SkinButton(item)
         item:SetWidth(xsize)
+        StripTextures(item)
+        CreateBackdrop(item, nil, nil, .75)
+        SetAllPointsOffset(item.backdrop, item, 4)
+        SetHighlight(item)
 
         icon:SetWidth(ysize)
         icon:SetHeight(ysize)
         icon:ClearAllPoints()
-        icon:SetPoint("LEFT", 3, 0)
+        icon:SetPoint("LEFT", 6, 0)
         icon:SetTexCoord(.08, .92, .08, .92)
+        icon:SetParent(item.backdrop)
+        icon:SetDrawLayer("OVERLAY")
+
+        count:SetParent(item.backdrop)
+        count:SetDrawLayer("OVERLAY")
+
+        title:SetParent(item.backdrop)
+        title:SetDrawLayer("OVERLAY")
       end
     end
   end
@@ -81,13 +94,6 @@ pfUI:RegisterSkin("Gossip and Quest", function ()
           num_items = MAX_NUM_ITEMS
           hook_func = "QuestFrameItems_Update"
         end
-
-        for i = 1, num_items do
-          local button = _G[frameName..panel.."Item"..i]
-          StripTextures(button)
-          CreateBackdrop(button, nil, true, .5)
-        end
-
       end
     end
   end
diff --git a/skins/blizzard/merchant.lua b/skins/blizzard/merchant.lua
index 11c442fe..e6e8da40 100644
--- a/skins/blizzard/merchant.lua
+++ b/skins/blizzard/merchant.lua
@@ -24,9 +24,12 @@ pfUI:RegisterSkin("Merchant", function ()
   for i = 1, BUYBACK_ITEMS_PER_PAGE, 1 do
     local merchantButton = _G["MerchantItem"..i]
     StripTextures(merchantButton)
-    CreateBackdrop(merchantButton, nil, nil, .75)
     merchantButton:SetHeight(37)
 
+    local bg = merchantButton:CreateTexture(nil, "LOW")
+    bg:SetTexture(1,1,1,.05)
+    bg:SetAllPoints()
+
     local itemButton = _G["MerchantItem"..i.."ItemButton"]
     StripTextures(itemButton)
     SkinButton(itemButton, nil, nil, nil, _G[itemButton:GetName()..'IconTexture'])
@@ -51,7 +54,9 @@ pfUI:RegisterSkin("Merchant", function ()
   SkinArrowButton(MerchantNextPageButton, "right", 18)
 
   StripTextures(MerchantBuyBackItem)
-  CreateBackdrop(MerchantBuyBackItem, nil, nil, .75)
+  local bg = MerchantBuyBackItem:CreateTexture(nil, "LOW")
+  bg:SetTexture(1,1,1,.05)
+  bg:SetAllPoints()
 
   StripTextures(MerchantBuyBackItemItemButton)
   SkinButton(MerchantBuyBackItemItemButton, nil, nil, nil, _G[MerchantBuyBackItemItemButton:GetName()..'IconTexture'])
diff --git a/skins/blizzard/questlog.lua b/skins/blizzard/questlog.lua
index 5c5c9247..290dbaa0 100644
--- a/skins/blizzard/questlog.lua
+++ b/skins/blizzard/questlog.lua
@@ -182,18 +182,30 @@ pfUI:RegisterSkin("Quest Log", function ()
       local item = _G[name]
       local icon = _G[name.."IconTexture"]
       local count = _G[name.."Count"]
-      local xsize = item:GetWidth() - 10
-      local ysize = item:GetHeight() - 10
+      local title = _G[name.."Name"]
+
+      local xsize = item:GetWidth() -12
+      local ysize = item:GetHeight() -12
 
-      StripTextures(item)
-      SkinButton(item)
       item:SetWidth(xsize)
+      StripTextures(item)
+      CreateBackdrop(item, nil, nil, .75)
+      SetAllPointsOffset(item.backdrop, item, 4)
+      SetHighlight(item)
 
       icon:SetWidth(ysize)
       icon:SetHeight(ysize)
       icon:ClearAllPoints()
-      icon:SetPoint("LEFT", 3, 0)
+      icon:SetPoint("LEFT", 6, 0)
       icon:SetTexCoord(.08, .92, .08, .92)
+      icon:SetParent(item.backdrop)
+      icon:SetDrawLayer("OVERLAY")
+
+      count:SetParent(item.backdrop)
+      count:SetDrawLayer("OVERLAY")
+
+      title:SetParent(item.backdrop)
+      title:SetDrawLayer("OVERLAY")
     end
   end
 end)