Commit 125228f7 authored by Simpy's avatar Simpy 🐹

11.35

parents 035bbe0f 196b0fac
......@@ -1530,9 +1530,6 @@ function E:Initialize()
twipe(self.global)
twipe(self.private)
LSM.DefaultMedia.font = 'PT Sans Narrow'
LSM.DefaultMedia.statusbar = 'ElvUI Norm'
self.myguid = UnitGUID('player')
self.data = E.Libs.AceDB:New('ElvDB', self.DF)
self.data.RegisterCallback(self, 'OnProfileChanged', 'StaggeredUpdateAll')
......
......@@ -117,7 +117,7 @@ function MC:CreateMoversConfigGroup()
config[moverName] = {
order = 1,
type = 'toggle',
name = data.text,
name = data.mover.textString,
get = function(info) return E.global.profileCopy.movers[moverName] end,
set = function(info, value) E.global.profileCopy.movers[moverName] = value; end
}
......@@ -127,7 +127,7 @@ function MC:CreateMoversConfigGroup()
config[moverName] = {
order = 1,
type = 'toggle',
name = data.text,
name = data.mover.textString,
get = function(info) return E.global.profileCopy.movers[moverName] end,
set = function(info, value) E.global.profileCopy.movers[moverName] = value; end
}
......
......@@ -48,7 +48,7 @@ local coordFrame = CreateFrame('Frame')
coordFrame:SetScript('OnUpdate', UpdateCoords)
coordFrame:Hide()
local function CreateMover(parent, name, text, overlay, snapOffset, postdrag, shouldDisable, configString)
local function UpdateMover(parent, name, text, overlay, snapOffset, postdrag, shouldDisable, configString)
if not parent then return end --If for some reason the parent isnt loaded yet
if E.CreatedMovers[name].Created then return end
......@@ -71,9 +71,18 @@ local function CreateMover(parent, name, text, overlay, snapOffset, postdrag, sh
f:Width(width)
f:Hide()
local fs = f:CreateFontString(nil, 'OVERLAY')
fs:FontTemplate()
fs:SetJustifyH('CENTER')
fs:Point('CENTER')
fs:SetText(text or name)
fs:SetTextColor(unpack(E.media.rgbvaluecolor))
f:SetFontString(fs)
f.parent = parent
f.text = fs
f.name = name
f.textString = text
f.textString = text or name
f.postdrag = postdrag
f.overlay = overlay
f.snapOffset = snapOffset or -2
......@@ -83,15 +92,6 @@ local function CreateMover(parent, name, text, overlay, snapOffset, postdrag, sh
E.CreatedMovers[name].mover = f
E.snapBars[#E.snapBars+1] = f
local fs = f:CreateFontString(nil, 'OVERLAY')
fs:FontTemplate()
fs:SetJustifyH('CENTER')
fs:Point('CENTER')
fs:SetText(text or name)
fs:SetTextColor(unpack(E.media.rgbvaluecolor))
f:SetFontString(fs)
f.text = fs
if E.db.movers and E.db.movers[name] then
if type(E.db.movers[name]) == 'table' then
f:Point(E.db.movers[name].p, E.UIParent, E.db.movers[name].p2, E.db.movers[name].p3, E.db.movers[name].p4)
......@@ -229,6 +229,7 @@ local function CreateMover(parent, name, text, overlay, snapOffset, postdrag, sh
local function OnShow(self)
self:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
self.text:FontTemplate()
end
local function OnMouseWheel(_, delta)
......@@ -374,11 +375,7 @@ function E:CreateMover(parent, name, text, overlay, snapoffset, postdrag, moverT
local mover = E.CreatedMovers[name]
if mover == nil then
mover = {}
mover.parent = parent
mover.text = text
mover.overlay = overlay
mover.postdrag = postdrag
mover.snapoffset = snapoffset
mover.type = {}
if E.LayoutMoverPositions[E.db.layoutSetting] and E.LayoutMoverPositions[E.db.layoutSetting][name] then
mover.point = E.LayoutMoverPositions[E.db.layoutSetting][name]
......@@ -388,10 +385,6 @@ function E:CreateMover(parent, name, text, overlay, snapoffset, postdrag, moverT
mover.point = GetPoint(parent)
end
mover.shouldDisable = shouldDisable
mover.configString = configString
mover.type = {}
local types = {split(',', moverTypes)}
for i = 1, #types do
local moverType = types[i]
......@@ -401,7 +394,7 @@ function E:CreateMover(parent, name, text, overlay, snapoffset, postdrag, moverT
E.CreatedMovers[name] = mover
end
CreateMover(parent, name, text, overlay, snapoffset, postdrag, shouldDisable, configString)
UpdateMover(parent, name, text, overlay, snapoffset, postdrag, shouldDisable, configString)
end
function E:ToggleMovers(show, moverType)
......@@ -543,6 +536,6 @@ end
function E:LoadMovers()
for n, t in pairs(E.CreatedMovers) do
CreateMover(t.parent, n, t.overlay, t.snapoffset, t.postdrag, t.shouldDisable, t.configString)
UpdateMover(t.parent, n, t.overlay, t.snapoffset, t.postdrag, t.shouldDisable, t.configString)
end
end
## Interface: 80300
## Author: Elv, Simpy
## Version: 11.341
## Version: 11.35
## Title: |cfffe7b2cElvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB
......
......@@ -376,11 +376,16 @@ function AB:CreateVehicleLeave()
local db = E.db.actionbar.vehicleExitButton
if db.enable ~= true then return end
local VehicleLeaveButtonHolder = CreateFrame('Frame', 'VehicleLeaveButtonHolder', E.UIParent)
VehicleLeaveButtonHolder:Point('BOTTOM', E.UIParent, 'BOTTOM', 0, 300)
VehicleLeaveButtonHolder:Size(_G.MainMenuBarVehicleLeaveButton:GetSize())
local holder = CreateFrame('Frame', 'VehicleLeaveButtonHolder', E.UIParent)
holder:Point('BOTTOM', E.UIParent, 'BOTTOM', 0, 300)
holder:Size(_G.MainMenuBarVehicleLeaveButton:GetSize())
E:CreateMover(holder, 'VehicleLeaveButton', L["VehicleLeaveButton"], nil, nil, nil, nil, nil, 'all,general')
local Button = _G.MainMenuBarVehicleLeaveButton
Button:ClearAllPoints()
Button:SetParent(_G.UIParent)
Button:SetPoint('CENTER', holder, 'CENTER')
if MasqueGroup and E.private.actionbar.masque.actionbars then
Button:StyleButton(true, true, true)
else
......@@ -390,17 +395,11 @@ function AB:CreateVehicleLeave()
Button:StyleButton(nil, true, true)
end
Button:ClearAllPoints()
Button:SetParent(_G.UIParent)
Button:SetPoint('CENTER', VehicleLeaveButtonHolder, 'CENTER')
E:CreateMover(VehicleLeaveButtonHolder, 'VehicleLeaveButton', L["VehicleLeaveButton"], nil, nil, nil, nil, nil, 'all,general')
hooksecurefunc(Button, 'SetPoint', function(_, _, parent)
if parent ~= VehicleLeaveButtonHolder then
if parent ~= holder then
Button:ClearAllPoints()
Button:SetParent(_G.UIParent)
Button:SetPoint('CENTER', VehicleLeaveButtonHolder, 'CENTER')
Button:SetPoint('CENTER', holder, 'CENTER')
end
end)
......@@ -418,6 +417,7 @@ function AB:UpdateVehicleLeave()
_G.MainMenuBarVehicleLeaveButton:Size(db.size)
_G.MainMenuBarVehicleLeaveButton:SetFrameStrata(db.strata)
_G.MainMenuBarVehicleLeaveButton:SetFrameLevel(db.level)
_G.VehicleLeaveButtonHolder:Size(db.size)
end
function AB:ReassignBindings(event)
......
......@@ -1494,6 +1494,7 @@ function B:ConstructContainerFrame(name, isBank)
--Search
f.editBox = CreateFrame('EditBox', name..'EditBox', f)
f.editBox:FontTemplate()
f.editBox:SetFrameLevel(f.editBox:GetFrameLevel() + 2)
f.editBox:CreateBackdrop()
f.editBox.backdrop:Point('TOPLEFT', f.editBox, 'TOPLEFT', -20, 2)
......@@ -1505,7 +1506,6 @@ function B:ConstructContainerFrame(name, isBank)
f.editBox:SetScript('OnTextChanged', B.UpdateSearch)
f.editBox:SetScript('OnChar', B.UpdateSearch)
f.editBox:SetText(SEARCH)
f.editBox:FontTemplate()
f.editBox.searchIcon = f.editBox:CreateTexture(nil, 'OVERLAY')
f.editBox.searchIcon:SetTexture('Interface/Common/UI-Searchbox-Icon')
......
......@@ -170,9 +170,9 @@ end
function M:Update_ZoneText()
if E.db.general.minimap.locationText == 'HIDE' or not E.private.general.minimap.enable then return; end
_G.Minimap.location:FontTemplate(E.Libs.LSM:Fetch("font", E.db.general.minimap.locationFont), E.db.general.minimap.locationFontSize, E.db.general.minimap.locationFontOutline)
_G.Minimap.location:SetText(utf8sub(GetMinimapZoneText(),1,46))
_G.Minimap.location:SetTextColor(M:GetLocTextColor())
_G.Minimap.location:FontTemplate(E.Libs.LSM:Fetch("font", E.db.general.minimap.locationFont), E.db.general.minimap.locationFontSize, E.db.general.minimap.locationFontOutline)
end
function M:PLAYER_REGEN_ENABLED()
......
......@@ -27,7 +27,7 @@ local PANEL_HEIGHT = 100
local PRIEST_COLOR = RAID_CLASS_COLORS.PRIEST
--Check if We are Raid Leader or Raid Officer
local function CheckRaidStatus()
function RU:CheckRaidStatus()
local _, instanceType = GetInstanceInfo()
if ((IsInGroup() and not IsInRaid()) or UnitIsGroupLeader('player') or UnitIsGroupAssistant("player")) and not (instanceType == "pvp" or instanceType == "arena") then
return true
......@@ -37,12 +37,12 @@ local function CheckRaidStatus()
end
--Change border when mouse is inside the button
local function ButtonEnter(self)
function RU:ButtonEnter()
self:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
end
--Change border back to normal when mouse leaves button
local function ButtonLeave(self)
function RU:ButtonLeave()
self:SetBackdropBorderColor(unpack(E.media.bordercolor))
end
......@@ -52,8 +52,8 @@ function RU:CreateUtilButton(name, parent, template, width, height, point, relat
b:Width(width)
b:Height(height)
b:Point(point, relativeto, point2, xOfs, yOfs)
b:HookScript("OnEnter", ButtonEnter)
b:HookScript("OnLeave", ButtonLeave)
b:HookScript("OnEnter", RU.ButtonEnter)
b:HookScript("OnLeave", RU.ButtonLeave)
b:SetTemplate("Transparent")
if text then
......@@ -63,12 +63,24 @@ function RU:CreateUtilButton(name, parent, template, width, height, point, relat
t:SetJustifyH("CENTER")
t:SetText(text)
b:SetFontString(t)
b.text = t
elseif texture then
local t = b:CreateTexture(nil, "OVERLAY", nil)
t:SetTexture(texture)
t:Point("TOPLEFT", b, "TOPLEFT", E.mult, -E.mult)
t:Point("BOTTOMRIGHT", b, "BOTTOMRIGHT", -E.mult, E.mult)
end
RU.Buttons[name] = b
return b
end
function RU:UpdateFonts()
for _, btn in pairs(RU.Buttons) do
if btn.text then
btn.text:FontTemplate()
end
end
end
function RU:ToggleRaidUtil(event)
......@@ -79,7 +91,7 @@ function RU:ToggleRaidUtil(event)
local RaidUtilityPanel = _G.RaidUtilityPanel
local RaidUtility_ShowButton = _G.RaidUtility_ShowButton
if CheckRaidStatus() then
if RU:CheckRaidStatus() then
if RaidUtilityPanel.toggled == true then
RaidUtility_ShowButton:Hide()
RaidUtilityPanel:Show()
......@@ -94,6 +106,8 @@ function RU:ToggleRaidUtil(event)
if event == "PLAYER_REGEN_ENABLED" then
self:UnregisterEvent("PLAYER_REGEN_ENABLED", 'ToggleRaidUtil')
elseif event == "PLAYER_ENTERING_WORLD" then
self:UpdateFonts()
end
end
......@@ -103,7 +117,7 @@ local function sortColoredNames(a, b)
end
local roleIconRoster = {}
local function onEnter(self)
function RU:RoleOnEnter()
wipe(roleIconRoster)
for i = 1, NUM_RAID_GROUPS do
......@@ -145,7 +159,7 @@ local function onEnter(self)
GameTooltip:Show()
end
local function RaidUtility_PositionRoleIcons()
function RU:PositionRoleIcons()
local point = E:GetScreenQuadrant(_G.RaidUtility_ShowButton)
local left = point and strfind(point, "LEFT")
_G.RaidUtilityRoleIcons:ClearAllPoints()
......@@ -166,7 +180,7 @@ local function UpdateIcons(self)
return
else
self:Show()
RaidUtility_PositionRoleIcons()
RU:PositionRoleIcons()
end
wipe(count)
......@@ -193,6 +207,7 @@ end
function RU:Initialize()
if E.private.general.raidUtility == false then return end
self.Initialized = true
self.Buttons = {}
--Create main frame
local RaidUtilityPanel = CreateFrame("Frame", "RaidUtilityPanel", E.UIParent, "SecureHandlerBaseTemplate")
......@@ -209,10 +224,9 @@ function RU:Initialize()
E.FrameLocks.RaidUtilityPanel = true
--Show Button
self:CreateUtilButton("RaidUtility_ShowButton", E.UIParent, "UIMenuButtonStretchTemplate, SecureHandlerClickTemplate", 136, 18, "TOP", E.UIParent, "TOP", -400, E.Border, _G.RAID_CONTROL, nil)
local RaidUtility_ShowButton = _G.RaidUtility_ShowButton
RaidUtility_ShowButton:SetFrameRef("RaidUtilityPanel", RaidUtilityPanel)
RaidUtility_ShowButton:SetAttribute("_onclick", ([=[
local ShowButton = self:CreateUtilButton("RaidUtility_ShowButton", E.UIParent, "UIMenuButtonStretchTemplate, SecureHandlerClickTemplate", 136, 18, "TOP", E.UIParent, "TOP", -400, E.Border, _G.RAID_CONTROL, nil)
ShowButton:SetFrameRef("RaidUtilityPanel", RaidUtilityPanel)
ShowButton:SetAttribute("_onclick", ([=[
local raidUtil = self:GetFrameRef("RaidUtilityPanel")
local closeButton = raidUtil:GetFrameRef("RaidUtility_CloseButton")
......@@ -239,22 +253,19 @@ function RU:Initialize()
raidUtil:SetPoint(raidUtilPoint, self, raidUtilPoint)
closeButton:SetPoint(raidUtilPoint, raidUtil, closeButtonPoint, 0, yOffset)
]=]):format(-E.Border + E.Spacing*3))
RaidUtility_ShowButton:SetScript("OnMouseUp", function()
ShowButton:SetScript("OnMouseUp", function()
RaidUtilityPanel.toggled = true
RaidUtility_PositionRoleIcons()
RU:PositionRoleIcons()
end)
RaidUtility_ShowButton:SetMovable(true)
RaidUtility_ShowButton:SetClampedToScreen(true)
RaidUtility_ShowButton:SetClampRectInsets(0, 0, -1, 1)
RaidUtility_ShowButton:RegisterForDrag("RightButton")
RaidUtility_ShowButton:SetFrameStrata("HIGH")
RaidUtility_ShowButton:SetScript("OnDragStart", function(sb)
ShowButton:SetMovable(true)
ShowButton:SetClampedToScreen(true)
ShowButton:SetClampRectInsets(0, 0, -1, 1)
ShowButton:RegisterForDrag("RightButton")
ShowButton:SetFrameStrata("HIGH")
ShowButton:SetScript("OnDragStart", function(sb)
sb:StartMoving()
end)
E.FrameLocks.RaidUtility_ShowButton = true
RaidUtility_ShowButton:SetScript("OnDragStop", function(sb)
ShowButton:SetScript("OnDragStop", function(sb)
sb:StopMovingOrSizing()
local point = sb:GetPoint()
local xOffset = sb:GetCenter()
......@@ -268,13 +279,14 @@ function RU:Initialize()
end
end)
E.FrameLocks.RaidUtility_ShowButton = true
--Close Button
self:CreateUtilButton("RaidUtility_CloseButton", RaidUtilityPanel, "UIMenuButtonStretchTemplate, SecureHandlerClickTemplate", 136, 18, "TOP", RaidUtilityPanel, "BOTTOM", 0, -1, _G.CLOSE, nil)
local RaidUtility_CloseButton = _G.RaidUtility_CloseButton
RaidUtility_CloseButton:SetFrameRef("RaidUtility_ShowButton", RaidUtility_ShowButton)
RaidUtility_CloseButton:SetAttribute("_onclick", [=[self:GetParent():Hide(); self:GetFrameRef("RaidUtility_ShowButton"):Show();]=])
RaidUtility_CloseButton:SetScript("OnMouseUp", function() RaidUtilityPanel.toggled = false end)
RaidUtilityPanel:SetFrameRef("RaidUtility_CloseButton", RaidUtility_CloseButton)
local CloseButton = self:CreateUtilButton("RaidUtility_CloseButton", RaidUtilityPanel, "UIMenuButtonStretchTemplate, SecureHandlerClickTemplate", 136, 18, "TOP", RaidUtilityPanel, "BOTTOM", 0, -1, _G.CLOSE, nil)
CloseButton:SetFrameRef("RaidUtility_ShowButton", ShowButton)
CloseButton:SetAttribute("_onclick", [=[self:GetParent():Hide(); self:GetFrameRef("RaidUtility_ShowButton"):Show();]=])
CloseButton:SetScript("OnMouseUp", function() RaidUtilityPanel.toggled = false end)
RaidUtilityPanel:SetFrameRef("RaidUtility_CloseButton", CloseButton)
--Role Icons
local RoleIcons = CreateFrame("Frame", "RaidUtilityRoleIcons", RaidUtilityPanel)
......@@ -303,14 +315,8 @@ function RU:Initialize()
texture:SetTexture(E.Media.Textures.RoleIcons) --(337499)
local texA, texB, texC, texD = GetTexCoordsForRole(role)
texture:SetTexCoord(texA, texB, texC, texD)
--[[if E.PixelMode then
texture:SetTexCoord(texA+0.0015, texB-0.005, texC-0.005, texD-0.01)
else
texture:SetTexCoord(texA+0.01, texB-0.01, texC+0.001, texD-0.015)
end]]
local texturePlace = --[[(E.PixelMode and 4) or]] 2
texture:Point("TOPLEFT", frame, "TOPLEFT", -texturePlace, texturePlace)
texture:Point("BOTTOMRIGHT", frame, "BOTTOMRIGHT", texturePlace, -texturePlace)
texture:Point("TOPLEFT", frame, "TOPLEFT", -2, 2)
texture:Point("BOTTOMRIGHT", frame, "BOTTOMRIGHT", 2, -2)
frame.texture = texture
local Count = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
......@@ -319,7 +325,7 @@ function RU:Initialize()
frame.count = Count
frame.role = role
frame:SetScript("OnEnter", onEnter)
frame:SetScript("OnEnter", RU.RoleOnEnter)
frame:SetScript("OnLeave", GameTooltip_Hide)
RoleIcons.icons[role] = frame
......@@ -328,7 +334,7 @@ function RU:Initialize()
--Disband Raid button
self:CreateUtilButton("DisbandRaidButton", RaidUtilityPanel, "UIMenuButtonStretchTemplate", RaidUtilityPanel:GetWidth() * 0.8, 18, "TOP", RaidUtilityPanel, "TOP", 0, -5, L["Disband Group"], nil)
_G.DisbandRaidButton:SetScript("OnMouseUp", function()
if CheckRaidStatus() then
if RU:CheckRaidStatus() then
E:StaticPopup_Show("DISBAND_RAID")
end
end)
......@@ -336,7 +342,7 @@ function RU:Initialize()
--Role Check button
self:CreateUtilButton("RoleCheckButton", RaidUtilityPanel, "UIMenuButtonStretchTemplate", RaidUtilityPanel:GetWidth() * 0.8, 18, "TOP", _G.DisbandRaidButton, "BOTTOM", 0, -5, _G.ROLE_POLL, nil)
_G.RoleCheckButton:SetScript("OnMouseUp", function()
if CheckRaidStatus() then
if RU:CheckRaidStatus() then
InitiateRolePoll()
end
end)
......@@ -356,7 +362,7 @@ function RU:Initialize()
--Ready Check button
self:CreateUtilButton("ReadyCheckButton", RaidUtilityPanel, "UIMenuButtonStretchTemplate", _G.RoleCheckButton:GetWidth() * 0.75, 18, "TOPLEFT", _G.RoleCheckButton, "BOTTOMLEFT", 0, -5, _G.READY_CHECK, nil)
_G.ReadyCheckButton:SetScript("OnMouseUp", function()
if CheckRaidStatus() then
if RU:CheckRaidStatus() then
DoReadyCheck()
end
end)
......@@ -412,8 +418,8 @@ function RU:Initialize()
f:SetHighlightTexture("")
f:SetDisabledTexture("")
f:HookScript("OnEnter", ButtonEnter)
f:HookScript("OnLeave", ButtonLeave)
f:HookScript("OnEnter", RU.ButtonEnter)
f:HookScript("OnLeave", RU.ButtonLeave)
f:SetTemplate(nil, true)
end
......
......@@ -528,6 +528,8 @@ function mod:StyleFilterSetChanges(frame, actions, HealthColor, PowerColor, Bord
end
function mod:StyleFilterClearChanges(frame, HealthColor, PowerColor, Borders, HealthFlash, HealthTexture, Scale, Alpha, NameColor, Portrait, NameOnly, Visibility)
wipe(frame.StyleFilterActionChanges)
if Visibility then
mod:StyleFilterUpdatePlate(frame)
frame:ClearAllPoints() -- pull the frame back in
......@@ -580,8 +582,6 @@ function mod:StyleFilterClearChanges(frame, HealthColor, PowerColor, Borders, He
if NameOnly then
mod:StyleFilterUpdatePlate(frame, true)
end
wipe(frame.StyleFilterActionChanges)
end
function mod:StyleFilterThreatUpdate(frame, unit)
......
......@@ -117,28 +117,25 @@ function UF:Update_AssistFrames(frame, db)
frame.VARIABLES_SET = true
end
if frame.isChild and frame.originalParent then
if frame.isChild then
local childDB = db.targetsGroup
frame.db = db.targetsGroup
if not frame.originalParent.childList then
frame.originalParent.childList = {}
end
frame.originalParent.childList[frame] = true;
frame:Size(childDB.width, childDB.height)
if not InCombatLockdown() then
if childDB.enable then
frame:SetParent(frame.originalParent)
frame:Size(childDB.width, childDB.height)
frame:Enable()
frame:ClearAllPoints()
frame:Point(E.InversePoints[childDB.anchorPoint], frame.originalParent, childDB.anchorPoint, childDB.xOffset, childDB.yOffset)
else
frame:SetParent(E.HiddenFrame)
frame:Disable()
end
end
else
frame:Size(frame.UNIT_WIDTH, frame.UNIT_HEIGHT)
end
frame:Size(frame.UNIT_WIDTH, frame.UNIT_HEIGHT)
--Health
UF:Configure_HealthBar(frame)
......
......@@ -170,25 +170,23 @@ function UF:Update_PartyFrames(frame, db)
childDB = db.targetsGroup
end
if not frame.originalParent.childList then
frame.originalParent.childList = {}
end
frame.originalParent.childList[frame] = true;
frame:Size(childDB.width, childDB.height)
if not InCombatLockdown() then
if childDB.enable then
frame:SetParent(frame.originalParent)
frame:Size(childDB.width, childDB.height)
frame:Enable()
frame:ClearAllPoints()
frame:Point(E.InversePoints[childDB.anchorPoint], frame.originalParent, childDB.anchorPoint, childDB.xOffset, childDB.yOffset)
else
frame:SetParent(E.HiddenFrame)
frame:Disable()
end
end
UF:Configure_HealthBar(frame)
UF:UpdateNameSettings(frame, frame.childType)
else
frame:Size(frame.UNIT_WIDTH, frame.UNIT_HEIGHT)
UF:EnableDisable_Auras(frame)
UF:Configure_AllAuras(frame)
UF:Configure_HealthBar(frame)
......@@ -213,8 +211,6 @@ function UF:Update_PartyFrames(frame, db)
UF:UpdateNameSettings(frame)
end
frame:Size(frame.UNIT_WIDTH, frame.UNIT_HEIGHT)
UF:Configure_RaidIcon(frame)
UF:Configure_Fader(frame)
UF:Configure_Cutaway(frame)
......
......@@ -116,28 +116,25 @@ function UF:Update_TankFrames(frame, db)
frame.VARIABLES_SET = true
end
if frame.isChild and frame.originalParent then
if frame.isChild then
local childDB = db.targetsGroup
frame.db = db.targetsGroup
if not frame.originalParent.childList then
frame.originalParent.childList = {}
end
frame.originalParent.childList[frame] = true;
frame:Size(childDB.width, childDB.height)
if not InCombatLockdown() then
if childDB.enable then
frame:SetParent(frame.originalParent)
frame:Size(childDB.width, childDB.height)
frame:Enable()
frame:ClearAllPoints()
frame:Point(E.InversePoints[childDB.anchorPoint], frame.originalParent, childDB.anchorPoint, childDB.xOffset, childDB.yOffset)
else
frame:SetParent(E.HiddenFrame)
frame:Disable()
end
end
else
frame:Size(frame.UNIT_WIDTH, frame.UNIT_HEIGHT)
end
frame:Size(frame.UNIT_WIDTH, frame.UNIT_HEIGHT)
--Health
UF:Configure_HealthBar(frame)
......
......@@ -3,7 +3,7 @@ local E, L, V, P, G = unpack(select(2, ...)) --Import: Engine, Locales, PrivateD
--Global Settings
G.general = {
UIScale = 0.64,
version = 11.341,
version = 11.35,
locale = E:GetLocale(),
eyefinity = false,
smallerWorldMap = true,
......
This diff is collapsed.
This diff is collapsed.
......@@ -365,7 +365,7 @@ L["Desaturated Icon"] = "图标褪色"
L["Descending"] = "降序"
L["Detach From Frame"] = "从框架分离"
L["Detached Width"] = "分离宽度"
L["Development Version"] = true
L["Development Version"] = "开发版"
L["Direction the bag sorting will use to allocate the items."] = "整理背包时物品排序方向"
L["Direction the bar moves on gains/losses"] = "条增加/减少时的方向"
L["Direction the health bar moves when gaining/losing health."] = "生命条的增减方向"
......@@ -540,7 +540,7 @@ L["Good"] = "安全"
L["Gossip Frame"] = "闲谈"
L["Group By"] = "队伍排列方式"
L["Group Spacing"] = "小队间隔"
L["Group Units"] = true
L["Group Units"] = "群体单位"
L["Grouping & Sorting"] = "分组与排序"
L["Groups Per Row/Column"] = "每行/列的队伍数"
L["Growth direction from the first unitframe."] = "增长方向从第一个头像框架开始"
......@@ -688,9 +688,9 @@ L["Import Profile"] = "导入配置文件"
L["Importing"] = "正在导入"
L["Index"] = "索引"
L["Indicate whether buffs you cast yourself should be separated before or after."] = "将你自身施放的增益从整体增益之前或之后分离出来"
L["Individual Units"] = true
L["Individual Units"] = "个体单位"
L["InfoPanel Border"] = "信息面板边框"
L["Information"] = true
L["Information"] = "信息"
L["Information Panel"] = "信息面板"
L["Inherit Global Fade"] = "继承全局渐隐"
L["Inherit the global fade, mousing over, targetting, setting focus, losing health, entering combat will set the remove transparency. Otherwise it will use the transparency level in the general actionbar settings for global fade alpha."] = "继承全局渐隐, 鼠标悬浮、目标、焦点、损失血量、进入战斗会减低不透明度.否则会为全局透明度使用一般动作条的设置"
......@@ -745,7 +745,7 @@ L["LF Guild Frame"] = "寻求公会"
L["LFG Icons"] = "随机队列图标"
L["LFG Queue"] = "随机队列"
L["Limit the number of rows or columns."] = "最大行数或列数"
L["Link to the latest development version."] = true
L["Link to the latest development version."] = "最新开发版链接"
L["List of words to color in chat if found in a message. If you wish to add multiple words you must seperate the word with a comma. To search for your current name you can use %MYNAME%.\n\nExample:\n%MYNAME%, ElvUI, RBGs, Tank"] = "如果在聊天信息中发现如下文字会自动上色该文字. 如果你需要添加多个词必须用逗号分开. 搜索你的名字可使用 %MYNAME%.\n\n例如:\n%MYNAME%, ElvUI, RBGs, Tank"
L["Load Distance"] = "读取距离"
L["Local Time"] = "本地时间"
......@@ -925,7 +925,7 @@ L["Pets"] = "宠物"
L["PetTarget"] = "宠物的目标"
L["Phase Indicator"] = "位面指示器"
L["Pin Voice Buttons"] = "固定语音按钮"
L["Player Bars"] = true