pop

YaeSakuraQvQ · Jul 17, 2023 · e763783 · e763783
1 parent 6957cf9
commit e763783
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/mi2u/ui/PopupTable.java b/src/mi2u/ui/PopupTable.java
@@ -17,26 +17,26 @@
 public class PopupTable extends Table{
     public boolean shown = false;
     public float fromx, fromy;
+    public float popupDuration = 0.15f;
 
     public void popup(int align){
         if(shown) return;
         Core.scene.add(this);
         shown = true;
         setTransform(true);
         clearActions();
-        float duration = 0.15f;
         if(Align.isTop(align)){
             actions(Actions.scaleTo(1f,0f), Actions.translateBy(0f, getPrefHeight()));
-            actions(Actions.parallel(Actions.scaleTo(1f, 1f, duration, Interp.fade), Actions.translateBy(0f , -getPrefHeight(), duration, Interp.fade), Actions.run(this::keepInScreen)));
+            actions(Actions.parallel(Actions.scaleTo(1f, 1f, popupDuration, Interp.fade), Actions.translateBy(0f , -getPrefHeight(), popupDuration, Interp.fade), Actions.run(this::keepInScreen)));
         }else if(Align.isBottom(align)){
             actions(Actions.scaleTo(1f,0f));
-            actions(Actions.parallel(Actions.scaleTo(1f, 1f, duration, Interp.fade), Actions.run(this::keepInScreen)));
+            actions(Actions.parallel(Actions.scaleTo(1f, 1f, popupDuration, Interp.fade), Actions.run(this::keepInScreen)));
         }else if(Align.isLeft(align)){
             actions(Actions.scaleTo(0f,1f));
-            actions(Actions.parallel(Actions.scaleTo(1f, 1f, duration, Interp.fade), Actions.run(this::keepInScreen)));
+            actions(Actions.parallel(Actions.scaleTo(1f, 1f, popupDuration, Interp.fade), Actions.run(this::keepInScreen)));
         }else if(Align.isRight(align)){
             actions(Actions.scaleTo(0f,1f), Actions.translateBy(getPrefWidth(), 0f));
-            actions(Actions.parallel(Actions.scaleTo(1f, 1f, duration, Interp.fade), Actions.translateBy(-getPrefWidth() , 0f, duration, Interp.fade), Actions.run(this::keepInScreen)));
+            actions(Actions.parallel(Actions.scaleTo(1f, 1f, popupDuration, Interp.fade), Actions.translateBy(-getPrefWidth() , 0f, popupDuration, Interp.fade), Actions.run(this::keepInScreen)));
         }
     }
 
@@ -45,7 +45,7 @@ public void popup(int align){
     public void hide(){
         if(!shown) return;
         shown = false;
-        actions(Actions.scaleTo(1f,0f, 0.15f, Interp.fade), Actions.delay(0.15f), Actions.remove());
+        actions(Actions.scaleTo(1f,0f, popupDuration, Interp.fade), Actions.delay(popupDuration), Actions.remove());
     }
 
     public void snapTo(Element e){

diff --git a/src/mi2u/ui/PowerGraphTable.java b/src/mi2u/ui/PowerGraphTable.java
@@ -107,6 +107,7 @@ public void rebuild(){
 
     public void showDetailFor(PGInfo info, MI2Bar bar){
         detailTable.shown = false;
+        detailTable.popupDuration = 0.05f;
         detailTable.background(Styles.black6);
         detailTable.clearChildren();
         buildInfo(detailTable, info);