feat: support ElvUI

DengSir · Apr 12, 2024 · b118643 · b118643
1 parent df872aa
commit b118643
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/API.lua b/API.lua
@@ -279,4 +279,5 @@ ns.SELL_HOURS = {[1] = AUCTION_DURATION_ONE, [2] = AUCTION_DURATION_TWO, [3] = A
 ns.SELL_HOURS = {[1] = '2' .. HOURS, [2] = '8' .. HOURS, [3] = '24' .. HOURS}
 -- @end-classic@
 
-ns.isZH = GetLocale() == 'zhCN' or GetLocale() == 'zhTW'
+ns.ZH = (GetLocale() == 'zhCN' or GetLocale() == 'zhTW')
+ns.NARROW_FILTER = ns.ZH and not ElvUI
diff --git a/Addon.lua b/Addon.lua
@@ -57,7 +57,7 @@ local DEFAULT_PROFILE = { --
     },
     buy = { --
         quickBuy = true,
-        hiddenColumns = {Seller = true, UnitBid = not ns.isZH or nil},
+        hiddenColumns = {Seller = true, UnitBid = not ns.ZH or nil},
     },
 }
 
@@ -228,10 +228,10 @@ function Addon:SetupBackground()
             end
         end
 
-        T('TopLeft', ns.isZH and 'Browse-zh' or 'Browse', 'Bid', 'Auction')
+        T('TopLeft', ns.NARROW_FILTER and 'Browse-zh' or 'Browse', 'Bid', 'Auction')
         T('Top', 'Browse', 'Auction', 'Auction')
         T('TopRight', 'Browse', 'Auction', 'Auction')
-        T('BotLeft', ns.isZH and 'Browse-zh' or 'Browse', 'Bid', 'Auction')
+        T('BotLeft', ns.NARROW_FILTER and 'Browse-zh' or 'Browse', 'Bid', 'Auction')
         T('Bot', 'Auction', 'Auction', 'Auction')
         T('BotRight', 'Bid', 'Bid', 'Auction')
     end

diff --git a/UI/Browse.lua b/UI/Browse.lua
@@ -11,8 +11,8 @@ local ripairs = ipairs_reverse or ripairs
 local L = ns.L
 
 local BUTTON_HEIGHT = 18
-local FILTER_FRAME_SHORT = ns.isZH and 48 or 0
-local CONTROL_LABEL_SPACING = ns.isZH and 0 or -3
+local FILTER_FRAME_SHORT = ns.NARROW_FILTER and 48 or 0
+local CONTROL_LABEL_SPACING = ns.NARROW_FILTER and 0 or -3
 
 local BUTTON_WIDTH_WITHSCROLL = 608 + FILTER_FRAME_SHORT
 local BUTTON_WIDTH_NOSCROLL = BUTTON_WIDTH_WITHSCROLL + 28
@@ -146,7 +146,7 @@ function Browse:LayoutBlizzard()
     parent(self.SearchButton)
     parent(self.ResetButton)
 
-    if ns.isZH then
+    if ns.NARROW_FILTER then
         local function SetWidth(button, width, our)
             if our then
                 return

diff --git a/UI/ElvUI.lua b/UI/ElvUI.lua
@@ -37,7 +37,7 @@ hook(ns.Addon, 'SetupUI', function(o, self)
             point(Browse.NextPageButton, 'TOPRIGHT', 70, -58)
             point(Browse.SearchCountText, 'BOTTOMLEFT', 190, 12)
             point(BrowseBidPrice, 'BOTTOM', 115, 8)
-            point(BrowseBidText, 'RIGHT', BrowseBidPrice, 'LEFT', -5, 0)
+            -- point(BrowseBidText, 'RIGHT', BrowseBidPrice, 'LEFT', -5, 0)
 
             S:HandleScrollBar(Browse.BuyFrame.ScrollFrame.scrollBar)
             S:HandleCheckBox(Browse.ExactCheckButton)