This commit is contained in:
Bunny67
2018-07-08 22:44:56 +03:00
parent b2e551a37c
commit a351942283
11 changed files with 36 additions and 36 deletions
+1 -1
View File
@@ -393,7 +393,7 @@ function B:CanItemGoInBag(bag, slot, targetBag)
end
local bagFamily = GetItemFamily(targetBag)
if itemFamily then
return (bagFamily == 0) or itemFamily == bagFamily
return (bagFamily == 0) or band(itemFamily, bagFamily) > 0
else
return false
end
+2 -2
View File
@@ -106,7 +106,7 @@ local function createSlot(id)
local iconFrame = CreateFrame("Frame", nil, frame)
E:Size(iconFrame, iconSize - 2)
E:Point(iconFrame, "RIGHT", frame)
iconFrame:SetPoint("RIGHT", frame)
E:SetTemplate(iconFrame, "Default")
frame.iconFrame = iconFrame
E["frames"][iconFrame] = nil
@@ -279,7 +279,7 @@ function M:LoadLoot()
lootFrame = CreateFrame("Button", "ElvLootFrame", lootFrameHolder)
lootFrame:SetClampedToScreen(true)
E:Point(lootFrame, "TOPLEFT", 0, 0)
lootFrame:SetPoint("TOPLEFT", 0, 0)
E:Size(lootFrame, 256, 64)
E:SetTemplate(lootFrame, "Transparent")
lootFrame:SetFrameStrata("FULLSCREEN")
+1 -1
View File
@@ -480,7 +480,7 @@ function mod:OnCreated(frame)
frame.UnitFrame = CreateFrame("Button", nil, frame)
E:Size(frame.UnitFrame, 100, 20)
E:Point(frame.UnitFrame, "CENTER", 0, 0)
frame.UnitFrame:SetPoint("CENTER", 0, 0)
frame.UnitFrame:SetScript("OnEvent", self.OnEvent)
frame.UnitFrame:SetScript("OnClick", function()
frame:Click()
+1 -1
View File
@@ -21,7 +21,7 @@ local function LoadSkin()
local QuestTimerFrameHolder = CreateFrame("Frame", "QuestTimerFrameHolder", E.UIParent)
E:Size(QuestTimerFrameHolder, 150, 22)
E:Point(QuestTimerFrameHolder, "TOP", QuestTimerFrameMover, "TOP")
QuestTimerFrameHolder:SetPoint("TOP", QuestTimerFrameMover, "TOP")
hooksecurefunc(QuestTimerFrame, "SetPoint", function(_, _, parent)
if parent ~= QuestTimerFrameHolder then
+3 -3
View File
@@ -81,13 +81,13 @@ function S:HandleButtonHighlight(frame)
local leftGrad = frame:CreateTexture(nil, "HIGHLIGHT")
E:Size(leftGrad, frame:GetWidth() * 0.5, frame:GetHeight() * 0.95)
E:Point(leftGrad, "LEFT", frame, "CENTER")
leftGrad:SetPoint("LEFT", frame, "CENTER")
leftGrad:SetTexture(E.media.blankTex)
leftGrad:SetGradientAlpha("Horizontal", 0.9, 0.9, 0.9, 0.35, 0.9, 0.9, 0.9, 0)
local rightGrad = frame:CreateTexture(nil, "HIGHLIGHT")
E:Size(rightGrad, frame:GetWidth() * 0.5, frame:GetHeight() * 0.95)
E:Point(rightGrad, "RIGHT", frame, "CENTER")
rightGrad:SetPoint("RIGHT", frame, "CENTER")
rightGrad:SetTexture(E.media.blankTex)
rightGrad:SetGradientAlpha("Horizontal", 0.9, 0.9, 0.9, 0, 0.9, 0.9, 0.9, 0.35)
end
@@ -183,7 +183,7 @@ function S:HandleNextPrevButton(btn, buttonOverride)
if not btn.icon then
btn.icon = btn:CreateTexture(nil, "ARTWORK")
E:Size(btn.icon, 13)
E:Point(btn.icon, "CENTER", 0, 0)
btn.icon:SetPoint("CENTER", 0, 0)
btn.icon:SetTexture("Interface\\AddOns\\ElvUI\\Media\\Textures\\SquareButtonTextures.blp")
btn.icon:SetTexCoord(0.01562500, 0.20312500, 0.01562500, 0.20312500)
+4 -4
View File
@@ -81,13 +81,13 @@ function TT:GameTooltip_SetDefaultAnchor(tt, parent)
else
local point = E:GetScreenQuadrant(TooltipMover)
if point == "TOPLEFT" then
E:Point(tt, "TOPLEFT", TooltipMover)
tt:SetPoint("TOPLEFT", TooltipMover)
elseif point == "TOPRIGHT" then
E:Point(tt, "TOPRIGHT", TooltipMover)
tt:SetPoint("TOPRIGHT", TooltipMover)
elseif point == "BOTTOMLEFT" or point == "LEFT" then
E:Point(tt, "BOTTOMLEFT", TooltipMover)
tt:SetPoint("BOTTOMLEFT", TooltipMover)
else
E:Point(tt, "BOTTOMRIGHT", TooltipMover)
tt:SetPoint("BOTTOMRIGHT", TooltipMover)
end
end
end
+12 -12
View File
@@ -1035,13 +1035,13 @@ function UF:ToggleTransparentStatusBar(isTransparent, statusBar, backdropTex, ad
backdropTex:ClearAllPoints()
if statusBarOrientation == "VERTICAL" then
E:Point(backdropTex, "TOPLEFT", statusBar, "TOPLEFT")
E:Point(backdropTex, "BOTTOMLEFT", statusBarTex, "TOPLEFT")
E:Point(backdropTex, "BOTTOMRIGHT", statusBarTex, "TOPRIGHT")
backdropTex:SetPoint("TOPLEFT", statusBar, "TOPLEFT")
backdropTex:SetPoint("BOTTOMLEFT", statusBarTex, "TOPLEFT")
backdropTex:SetPoint("BOTTOMRIGHT", statusBarTex, "TOPRIGHT")
else
E:Point(backdropTex, "TOPLEFT", statusBarTex, "TOPRIGHT")
E:Point(backdropTex, "BOTTOMLEFT", statusBarTex, "BOTTOMRIGHT")
E:Point(backdropTex, "BOTTOMRIGHT", statusBar, "BOTTOMRIGHT")
backdropTex:SetPoint("TOPLEFT", statusBarTex, "TOPRIGHT")
backdropTex:SetPoint("BOTTOMLEFT", statusBarTex, "BOTTOMRIGHT")
backdropTex:SetPoint("BOTTOMRIGHT", statusBar, "BOTTOMRIGHT")
end
if invertBackdropTex then
@@ -1070,13 +1070,13 @@ function UF:ToggleTransparentStatusBar(isTransparent, statusBar, backdropTex, ad
if adjustBackdropPoints then
backdropTex:ClearAllPoints()
if statusBarOrientation == "VERTICAL" then
E:Point(backdropTex, "TOPLEFT", statusBar, "TOPLEFT")
E:Point(backdropTex, "BOTTOMLEFT", statusBarTex, "TOPLEFT")
E:Point(backdropTex, "BOTTOMRIGHT", statusBarTex, "TOPRIGHT")
backdropTex:SetPoint("TOPLEFT", statusBar, "TOPLEFT")
backdropTex:SetPoint("BOTTOMLEFT", statusBarTex, "TOPLEFT")
backdropTex:SetPoint("BOTTOMRIGHT", statusBarTex, "TOPRIGHT")
else
E:Point(backdropTex, "TOPLEFT", statusBarTex, "TOPRIGHT")
E:Point(backdropTex, "BOTTOMLEFT", statusBarTex, "BOTTOMRIGHT")
E:Point(backdropTex, "BOTTOMRIGHT", statusBar, "BOTTOMRIGHT")
backdropTex:SetPoint("TOPLEFT", statusBarTex, "TOPRIGHT")
backdropTex:SetPoint("BOTTOMLEFT", statusBarTex, "BOTTOMRIGHT")
backdropTex:SetPoint("BOTTOMRIGHT", statusBar, "BOTTOMRIGHT")
end
end