Skip to content

Commit

Permalink
Some fixes
Browse files Browse the repository at this point in the history
- Fix #786
- Fix #795
- Fix performance fix
- Bump version
  • Loading branch information
Aviana committed Dec 4, 2020
1 parent d6fb95b commit e8c3737
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 33 deletions.
8 changes: 4 additions & 4 deletions LunaUnitFrames.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- Luna Unit Frames 4.0 by Aviana

LUF = select(2, ...)
LUF.version = 4030
LUF.version = 4040

local L = LUF.L
local ACR = LibStub("AceConfigRegistry-3.0", true)
Expand Down Expand Up @@ -364,7 +364,7 @@ function LUF:HideBlizzardFrames()
handleFrame(CastingBarFrame)
active_hiddens.cast = true
elseif( not self.db.profile.hidden.cast and not active_hiddens.cast ) then
CastingBarFrame_OnLoad(CastingBarFrame, "player", true, false)
CastingBarFrame_OnLoad(CastingBarFrame, "player", true, false) --restore castbar as oUF kills it
end

if( CompactRaidFrameManager ) then
Expand Down Expand Up @@ -904,7 +904,7 @@ function LUF.PlaceModules(frame)
usableX = (frame:GetWidth() - 2) * config.portrait.width
v:SetWidth(usableX)
usableX = frame:GetWidth() - usableX - 2
elseif not config[k].autoHide or v:IsShown() then
elseif (not config[k].autoHide or v:IsShown()) and not v.isDisabled then
if config[k].vertical then
table.insert(vert,{key = k, order = config[k].order, size = config[k].height})
vertValue = vertValue + config[k].height
Expand Down Expand Up @@ -1305,9 +1305,9 @@ frame:SetScript("OnEvent", function(self, event, addon)
elseif( event == "ADDON_LOADED" and ( addon == "Blizzard_ArenaUI" or addon == "Blizzard_CompactRaidFrames" ) and not LUF.InCombatLockdown) then
LUF:HideBlizzardFrames()
elseif event == "PLAYER_REGEN_DISABLED" then
LUF.InCombatLockdown = true
if not LUF.db.profile.locked then
LUF.db.profile.locked = true
LUF.InCombatLockdown = true
LUF:UpdateMovers()
if( ACR ) then
ACR:NotifyChange("LunaUnitFrames")
Expand Down
2 changes: 1 addition & 1 deletion LunaUnitFrames.toc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## Title: Luna Unit Frames
## Notes:
## Author: Aviana
## Version: 4030
## Version: 4040
## SavedVariables: LunaUFDB
## OptionalDeps: Ace3, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets, LibSpellRange-1.0, Clique, RealMobHealth
## X-License: WTFPL (http://www.wtfpl.net/about/)
Expand Down
2 changes: 2 additions & 0 deletions locales/deDE.lua
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@ local L = {
["Squares"] = "Vierecke",
["What the indicator should display."] = "Was der Indikator anzeigen soll.",
["Name (exact) or ID"] = "Name (exakt) oder ID",
["Name (partial) or ID"] = "Name (partiell) oder ID",
["Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic"] = "Name (exakt) oder ID des anzuzeigenden Effektes. Benutze ; als logisches UND und / als logisches ODER. Verwende [mana] um nur Manaklassen zu pr\195\188fen. Beispiel: Arkane Intelligenz[mana]/Arkane Brillanz[mana];Magie d\195\164mpfen",
["Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras"] = "Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras",
["Buff/Debuff"] = "St\195\164rkung/Schw\195\164chung",
["Own buff/debuff"] = "Eigene St\195\164rkung/Schw\195\164chung",
["Missing Buff"] = "Fehlende St\195\164rkung",
Expand Down
2 changes: 2 additions & 0 deletions locales/enUS.lua
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ local L = {
["Squares"] = "Squares",
["What the indicator should display."] = "What the indicator should display.",
["Name (exact) or ID"] = "Name (exact) or ID",
["Name (partial) or ID"] = "Name (partial) or ID",
["Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic"] = "Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic",
["Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras"] = "Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras",
["Buff/Debuff"] = "Buff/Debuff",
["Own buff/debuff"] = "Own buff/debuff",
["Missing Buff"] = "Missing Buff",
Expand Down
2 changes: 2 additions & 0 deletions locales/koKR.lua
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ local L = {
["Squares"] = "지시기",
["What the indicator should display."] = "지시기가 표시할 항목을 설정합니다.",
["Name (exact) or ID"] = "(정확한) 이름 또는 ID",
["Name (partial) or ID"] = "Name (partial) or ID",
["Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic"] = "Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic",
["Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras"] = "Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras",
["Buff/Debuff"] = "버프/디버프",
["Own buff/debuff"] = "자신의 버프/디버프",
["Missing Buff"] = "누락된 버프",
Expand Down
2 changes: 2 additions & 0 deletions locales/zhCN.lua
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ local L = {
["Squares"] = "自定义指示器",
["What the indicator should display."] = "指示器要显示什么。",
["Name (exact) or ID"] = "正确法术全名 或者 ID",
["Name (partial) or ID"] = "Name (partial) or ID",
["Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic"] = "Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic",
["Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras"] = "Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras",
["Buff/Debuff"] = "光环图标",
["Own buff/debuff"] = "你施放的光环",
["Missing Buff"] = "Missing Buff",
Expand Down
2 changes: 2 additions & 0 deletions locales/zhTW.lua
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ local L = {
["Squares"] = "自訂邊角指示器",
["What the indicator should display."] = "指示器要顯示什麼。",
["Name (exact) or ID"] = "正確全名 或者 ID",
["Name (partial) or ID"] = "Name (partial) or ID",
["Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic"] = "Name (exact) or ID of the effect to track. Use ; as a logical AND and / as logical OR. Also supports [mana] to only check on mana classes. Example: Arcane Intellect[mana]/Arcane Brilliance[mana];Dampen Magic",
["Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras"] = "Name (partial) or ID of the effect to track. Use ; as a seperator for multiple auras",
["Buff/Debuff"] = "光環圖示",
["Own buff/debuff"] = "你施放的光環",
["Missing Buff"] = "Missing Buff",
Expand Down
Loading

0 comments on commit e8c3737

Please sign in to comment.