From 2a0ba3720f9c8f15096a338ef9a4992feb1c7a23 Mon Sep 17 00:00:00 2001 From: LenweSaralonde Date: Thu, 2 Jun 2022 22:26:30 +0200 Subject: [PATCH] Restored nameplate visibility logic #81 #80 --- .../MusicianNamePlates/MusicianNamePlates.lua | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/modules/MusicianNamePlates/MusicianNamePlates.lua b/modules/MusicianNamePlates/MusicianNamePlates.lua index 518363c9..9a302fa9 100644 --- a/modules/MusicianNamePlates/MusicianNamePlates.lua +++ b/modules/MusicianNamePlates/MusicianNamePlates.lua @@ -455,17 +455,12 @@ function Musician.NamePlates.UpdateNamePlateCinematicMode(namePlate) end -- Set nameplate visibility - local isNamePlateVisible = UIParentIsVisible or not(UIParentIsVisible) and Musician_Settings.cinematicMode and Musician_Settings.cinematicModeNamePlates - Musician.NamePlates.SetNamePlateShown(namePlate, isNamePlateVisible) -end - ---- Set the player nameplate visibility in cinematic mode. --- @param namePlate (Frame) --- @param isShown (boolean) -function Musician.NamePlates.SetNamePlateShown(namePlate, isShown) - namePlate:SetShown(isShown) - if namePlate.UnitFrame and namePlate.UnitFrame.name and UnitIsPlayer(namePlate.namePlateUnitToken) then - namePlate.UnitFrame.name:SetShown(isShown) + if not(Musician_Settings.cinematicModeNamePlates) and Musician_Settings.cinematicMode or not(Musician_Settings.cinematicMode) then + if UIParentIsVisible then + namePlate:Show() + else + namePlate:Hide() + end end end @@ -657,11 +652,7 @@ end --- OnSetUIVisibility -- @param isVisible (boolean) function Musician.NamePlates.OnSetUIVisibility(isVisible) - if not(isVisible) then - if Musician_Settings.cinematicMode then - SetInWorldUIVisibility(true) - end - else + if isVisible or not(isVisible) and Musician_Settings.cinematicMode then SetInWorldUIVisibility(true) end end