fix(flash): flash wasn't working if icons were hidden

Sidoine · Jan 20, 2021 · b81daf8 · b81daf8
1 parent ab20023
commit b81daf8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/scripts/ovale_warlock_spells.ts b/src/scripts/ovale_warlock_spells.ts
@@ -376,9 +376,9 @@ Define(lead_by_example_soulbind 342156)
     // END
     code += `
 #grimoire_of_sacrifice
-    SpellRequire(grimoire_of_sacrifice unusable set=1 enabled=(not pet.present()))
+  SpellRequire(grimoire_of_sacrifice unusable set=1 enabled=(not pet.present()))
 #soul_strike
-    SpellRequire(soul_strike unusable set=1 enabled=(not pet.present() or not pet.creaturefamily("Felguard")))
+  SpellRequire(soul_strike unusable set=1 enabled=(not pet.present() or not pet.creaturefamily("Felguard")))
     `;
     OvaleScripts.RegisterScript(
         "WARLOCK",

diff --git a/src/ui/Frame.ts b/src/ui/Frame.ts
@@ -270,7 +270,7 @@ class OvaleFrame extends WidgetContainer<UIFrame> implements IconParent {
                         start = element.timeSpan.NextTime(atTime);
                     }
                     if (profile.apparence.enableIcons) {
-                        this.UpdateActionIcon(icon, element, start || 0);
+                        this.updateActionIcon(icon, element, start || 0);
                     }
                     if (profile.apparence.spellFlash.enabled) {
                         this.ovaleSpellFlash.Flash(
@@ -294,7 +294,7 @@ class OvaleFrame extends WidgetContainer<UIFrame> implements IconParent {
         }
     }
 
-    UpdateActionIcon(
+    private updateActionIcon(
         action: Action,
         element: AstNodeSnapshot,
         start: number,
@@ -383,7 +383,7 @@ class OvaleFrame extends WidgetContainer<UIFrame> implements IconParent {
                 }
                 icons.SetPoint(
                     "TOPLEFT",
-                    this.updateFrame,
+                    this.iconsFrame,
                     "TOPLEFT",
                     (action.left + ratio * action.dx) / action.scale,
                     (action.top + ratio * action.dy) / action.scale
@@ -394,7 +394,7 @@ class OvaleFrame extends WidgetContainer<UIFrame> implements IconParent {
         if (!profile.apparence.moving) {
             icons.SetPoint(
                 "TOPLEFT",
-                this.updateFrame,
+                this.iconsFrame,
                 "TOPLEFT",
                 action.left / action.scale,
                 action.top / action.scale -
@@ -646,8 +646,11 @@ class OvaleFrame extends WidgetContainer<UIFrame> implements IconParent {
     localstatus = {};
     actions: LuaArray<Action> = {};
 
-    /** Only used to know the update interval */
+    iconsFrame: UIFrame;
+
+    /** Only used to know the update interval, must be visible */
     updateFrame: UIFrame;
+
     timeSinceLastUpdate: number;
 
     /** Used to drag the frame */
@@ -693,10 +696,12 @@ class OvaleFrame extends WidgetContainer<UIFrame> implements IconParent {
         // this.hider = hider;
         this.updateFrame = CreateFrame(
             "Frame",
-            `${ovale.GetName()}UpdateFrame`,
-            this.frame
+            `${ovale.GetName()}UpdateFrame`
         );
         this.updateFrame.SetAllPoints(this.frame);
+        this.updateFrame.Show();
+        this.iconsFrame = CreateFrame("Frame", undefined, this.frame);
+        this.iconsFrame.SetAllPoints(this.frame);
         this.dragHandleTexture = this.frame.CreateTexture();
         if (Masque) {
             this.skinGroup = Masque.Group(ovale.GetName());

diff --git a/src/ui/Icon.ts b/src/ui/Icon.ts
@@ -28,7 +28,7 @@ const COOLDOWN_THRESHOLD = 0.1;
 export interface IconParent {
     checkBoxWidget: LuaObj<AceGUIWidgetCheckBox>;
     listWidget: LuaObj<AceGUIWidgetDropDown>;
-    updateFrame: UIFrame;
+    iconsFrame: UIFrame;
     ToggleOptions(): void;
     debugIcon(index: number): void;
 }
@@ -80,7 +80,7 @@ export class OvaleIcon {
         this.frame = CreateFrame(
             "CheckButton",
             name,
-            parent.updateFrame,
+            parent.iconsFrame,
             (secure && "SecureActionButtonTemplate, ActionButtonTemplate") ||
                 "ActionButtonTemplate"
         );