*/}}
Browse Source

Undid the "StopUsing" fix which is not how it's supposed to be fixed. (Should use panel reserved nodes because PP changes)

Yiming Wu 2 years ago
parent
commit
47a740c2cd
2 changed files with 8 additions and 9 deletions
  1. 2 2
      source/lagui/la_data.c
  2. 6 7
      source/lagui/la_kernel.c

+ 2 - 2
source/lagui/la_data.c

@@ -426,10 +426,10 @@ void la_UsePropPack(laPropPack *pp, int ForceRecalc){
         }
     }
     for (ps = pp->Go; ps; ps = ps->pNext){
-        if (ps->Type==L'.'){ printf("%s ", ps->p->Identifier);
+        if (ps->Type==L'.'){
             laUseDataBlock(ps->UseInstance, ps->p, MAIN.PropMatcherContextP->FrameDistinguish, MAIN.PropMatcherContextP, la_PropPanelUserRemover, ForceRecalc);
         }
-    }printf("\n");
+    }
 }
 void la_StopUsingPropPack(laPropPack *pp){
     laPropStep *ps;

+ 6 - 7
source/lagui/la_kernel.c

@@ -1083,7 +1083,7 @@ void la_PanelDrawToOffsceen(laPanel *p, laUiList *uil){
 }
 void la_PanelRefreshDetachedProp(laPanel *panel){
     laProp *p;
-    for (p = panel->PropLinkContainer->Props.pFirst; p; p = p->Item.pNext){la_StopUsingPropPack(&p->DetachedPP);
+    for (p = panel->PropLinkContainer->Props.pFirst; p; p = p->Item.pNext){
         la_StepPropPack(&p->DetachedPP);
         la_UsePropPack(&p->DetachedPP, 0);
         //if (p->DetachedPP.LastPs && p->DetachedPP.LastPs->p->Container ? p->DetachedPP.LastPs->p->Container->Hyper : 0){
@@ -3554,7 +3554,6 @@ void la_StepExpression(laUiConditionNode *e){
         la_StepExpression(e->Expression1);
         break;
     case LA_CONDITION_PROP:
-        la_StopUsingPropPack(&e->PP);
         la_StepPropPack(&e->PP);
         if (e->PP.LastPs && e->PP.LastPs->p->Container && e->PP.LastPs->p->Container->Hyper){
             la_UsePropPack(&e->PP, 1);
@@ -4214,7 +4213,7 @@ int la_UpdateUiListRecursive(laUiList *uil, int U, int L, int R, int B, int Fast
 
                 if (!TInstance){
                     while (iuil){
-                        puil = iuil->Item.pNext;ui->PP.EndInstance=iuil->Instance; la_StopUsingPropPack(&ui->PP);
+                        puil = iuil->Item.pNext;
                         la_DestroyTabPage(ui, iuil, 0);
                         iuil = puil;
                     }
@@ -4251,7 +4250,7 @@ int la_UpdateUiListRecursive(laUiList *uil, int U, int L, int R, int B, int Fast
 
                     while (iuil && iuil->Instance != TInstance){
                         while (iuil && iuil->Instance != TInstance){
-                            puil = iuil->Item.pNext;ui->PP.EndInstance=iuil->Instance; la_StopUsingPropPack(&ui->PP);
+                            puil = iuil->Item.pNext;
                             la_DestroyTabPage(ui, iuil, 0);
                             iuil = puil;
                         }
@@ -4278,7 +4277,7 @@ int la_UpdateUiListRecursive(laUiList *uil, int U, int L, int R, int B, int Fast
                         //ui->PP.EndInstance = TInstance;
                         if (!TInstance){
                             while (iuil){
-                                puil = iuil->Item.pNext;ui->PP.EndInstance=iuil->Instance; la_StopUsingPropPack(&ui->PP);
+                                puil = iuil->Item.pNext;
                                 la_DestroyTabPage(ui, iuil, 0);
                                 iuil = puil;
                             }
@@ -4315,7 +4314,7 @@ int la_UpdateUiListRecursive(laUiList *uil, int U, int L, int R, int B, int Fast
                     MaxB = MaxB < ElementB ? ElementB : MaxB;
                 }
                 while (iuil){
-                    puil = iuil->Item.pNext;ui->PP.EndInstance=iuil->Instance; la_StopUsingPropPack(&ui->PP);
+                    puil = iuil->Item.pNext;
                     la_DestroyTabPage(ui, iuil, 0);
                     iuil = puil;
                 }
@@ -4336,7 +4335,7 @@ int la_UpdateUiListRecursive(laUiList *uil, int U, int L, int R, int B, int Fast
                     SubB = la_UpdateUiListRecursive(ui->Page, ui->TB+(NoDecal?0:bt->TM), ui->TL+(NoDecal?0:bt->LM), ui->TR-(NoDecal?0:bt->RM), B, Fast, ParentPanel);
                     ui->TB = SubB + bt->BM;
                 }else if (ui->Subs.pFirst){
-                    if (!TInstance || TInstance != ui->Page->Instance){ui->PP.EndInstance=((laUiList*)ui->Subs.pFirst)->Instance; la_StopUsingPropPack(&ui->PP);
+                    if (!TInstance || TInstance != ui->Page->Instance){
                         la_DestroyTabPage(ui, ui->Subs.pFirst, 0);
                         ui->Page = 0;
                         if (TInstance){