StateChangeした時にアイコンの表示状態を即時反映するように修正

Lionas · Aug 30, 2016 · 347942a · 347942a
1 parent e832f54
commit 347942a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.lua b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.lua
@@ -137,7 +137,7 @@ function OnIconMouseUp(self, mouseButton, upInside)
 
   if mouseButton == 2 and upInside then -- right click
 
-    LioFADR.isNeverNotify = true
+    LioFADR.isNeverNotify = true   
     hideIcon()
 
   end
@@ -364,6 +364,24 @@ local function notifyExpiredBuffs(currentBuffs)
 end
 
 
+-- show / hide icon
+local function setIconVisibility()
+
+  if(((LioFADRCommon.getTableLength(LioFADR.notifyRemain) > 0) or 
+     (LioFADRCommon.getTableLength(LioFADR.notifyClosed) > 0) or
+     (LioFADRCommon.getTableLength(LioFADR.notifyExpired)> 0)) and
+     not LioFADR.isNeverNotify) then
+
+    showIcon()
+
+  else
+
+    hideIcon()
+  end
+
+end
+
+
 -- Scan buffs
 local function scanBuffs()
 
@@ -443,17 +461,7 @@ local function scanBuffs()
   end
 
   -- アイコンの表示判断
-  if(((LioFADRCommon.getTableLength(LioFADR.notifyRemain) > 0) or 
-     (LioFADRCommon.getTableLength(LioFADR.notifyClosed) > 0) or
-     (LioFADRCommon.getTableLength(LioFADR.notifyExpired)> 0)) and
-     not LioFADR.isNeverNotify) then
-
-    showIcon()
-
-  else
-    hideIcon()
-  end
-
+  setIconVisibility()
 
 end
 
@@ -586,6 +594,9 @@ local function initializeIcon()
         LioFADR.isHideScene = true
       end
 
+      -- アイコンの表示判断
+      setIconVisibility()
+
     end
   )
   HUD_UI_SCENE:RegisterCallback("StateChange", 
@@ -599,6 +610,9 @@ local function initializeIcon()
         LioFADR.isHideReticle = false
       end
 
+      -- アイコンの表示判断
+      setIconVisibility()
+
     end
   )
 

diff --git a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml
@@ -1,6 +1,6 @@
 <GuiXml>
     <Controls>
-        <TopLevelControl name="LioFADRContainer" mouseEnabled="true" movable="false" clampedToScreen="true" hidden="false" tier="2" layer="2" level="2" hidden="true" >
+        <TopLevelControl name="LioFADRContainer" mouseEnabled="true" movable="false" clampedToScreen="true" hidden="true" tier="2" layer="2" level="2">
             <Dimensions x="1" y="1" />
             <Anchor point="TOPLEFT" relativeTo="GuiRoot" relativePoint="CENTER" offsetX="0" offsetY="0"/>
         </TopLevelControl>