fix asPad fields not updating

Author: neu-rah

src/items.cpp

@@ -204,10 +204,11 @@ bool menuNode::changed(const navNode &nav,const menuOut& out,bool sub,bool test)
     }
     // idx_t tit=hasTitle(nav.root->path[lev])?1:0;//TODO: this might not be correct.. checking
     idx_t my=out.maxY()-((has(showTitle)||(nav.root->showTitle&&!has(noTitle)))?1:0);
-    trace(Serial<<"level:"<<level<<" target:"<<*nav.root->navFocus<<" "<<nav.root->navFocus->has(_parentDraw)<<" "<<nav.root->navFocus->has(_asPad)<<endl);
-    idx_t lev=level-(nav.root->navFocus->has(_parentDraw)&&nav.root->navFocus->isMenu());
+    // trace(Serial<<"level:"<<level<<" target:"<<*nav.root->navFocus<<" "<<nav.root->navFocus->has(_parentDraw)<<" "<<nav.root->navFocus->has(_asPad)<<endl);
+    // idx_t lev=level-(nav.root->navFocus->has(_parentDraw)&&nav.root->navFocus->isMenu());
+    idx_t t=out.tops[level-nav.root->navFocus->has(_parentDraw)&&has(_asPad)];
     // trace(Serial<<"tit:"<<tit<<endl;);
-    idx_t t=out.tops[lev];
+    // idx_t t=out.tops[lev];
     trace(Serial<<"t:"<<t<<endl;);
     if (sub) for(int i=0;i<my;i++,t++) {
       if (t>=sz()) break;
@@ -233,8 +234,9 @@ void menuNode::clearChanged(const navNode &nav,const menuOut& out,bool sub) {
     if (parentDraw())
       return nav.root->path[level-1].target->clearChanged(nav.root->path[level-1],out,sub);
     idx_t my=out.maxY()-((has(showTitle)||(nav.root->showTitle&&!has(noTitle)))?1:0);
-    idx_t lev=level-(nav.root->navFocus->has(_parentDraw)&&nav.root->navFocus->isMenu());
-    idx_t t=out.tops[lev];
+    // idx_t lev=level-(nav.root->navFocus->has(_parentDraw)&&nav.root->navFocus->isMenu());
+    // idx_t t=out.tops[lev];
+    idx_t t=out.tops[level-nav.root->navFocus->has(_parentDraw)&&has(_asPad)];
     for(idx_t i=0;i<my;i++,t++) {//only signal visible
       if (t>=sz()) break;//menu ended
       operator[](t).clearChanged(nav,out,false);
@@ -466,3 +468,68 @@ void menuVariantBase::doNav(navNode& nav,navCmd cmd) {
     nav.root->exit();
   }
 }
+
+// template<bool clear>
+// bool menuNode::_changes(const navNode &nav,const menuOut& out,bool sub,bool test) {
+//   trace(Serial<<*this<<" menuNode::"<<(clear?"clearChanged":"changed")<<" test:"<<test<<endl);
+//   if (clear) dirty=false;
+//   else if (dirty) {
+//     trace(if (test) Serial<<"just dirty!"<<endl);
+//     return true;
+//   }
+//   if (has((systemStyles)(_asPad|_parentDraw))) {
+//     for(int i=0;i<sz();i++)
+//       if (clear) operator[](i).clearChanged(nav,out,false);
+//       else if (operator[](i).changed(nav,out,false,test)) {
+//         trace(if (test) Serial<<"APPD! "<<operator[](i)<<endl);
+//         return true;
+//       }
+//   } else {
+//     // if (!(nav.target==this&&sub)) return;???
+//     if (!(clear||(nav.target==this&&sub))) {
+//       trace(if (test&&dirty) Serial<<"indirect!"<<endl);
+//       return dirty;// second hand check, just report self
+//     }
+//     idx_t level=nav.root->level;
+//     if (parentDraw()) {
+//       if (clear) nav.root->path[level-1].target->clearChanged(nav.root->path[level-1],out,sub);
+//       else {
+//         trace(Serial<<"return changed of parent-draw element"<<endl);
+//         trace(if (test) Serial<<"parentDraw()!"<<endl);
+//         return nav.root->path[level-1].target->changed(nav.root->path[level-1],out,sub,test);
+//       }
+//     }
+//     // idx_t tit=hasTitle(nav.root->path[lev])?1:0;//TODO: this might not be correct.. checking
+//     idx_t my=out.maxY()-((has(showTitle)||(nav.root->showTitle&&!has(noTitle)))?1:0);
+//     // trace(Serial<<"level:"<<level<<" target:"<<*nav.root->navFocus<<" "<<nav.root->navFocus->has(_parentDraw)<<" "<<nav.root->navFocus->has(_asPad)<<endl);
+//     // idx_t lev=level-(nav.root->navFocus->has(_parentDraw)&&(nav.root->navFocus->isMenu()||nav.root->navFocus->has(_asPad)));
+//     // idx_t t=out.tops[lev];
+//     idx_t t=out.tops[level-nav.root->navFocus->has(_parentDraw)&&has(_asPad)];
+//     trace(Serial<<"t:"<<t<<endl;);
+//     if (sub) for(int i=0;i<my;i++,t++) {
+//       if (t>=sz()) break;
+//       if (clear) operator[](t).clearChanged(nav,out,false);
+//       {
+//         trace(Serial<<"checking:"<<operator[](t)<<endl);
+//         if (operator[](t).changed(nav,out,false,test)) {
+//           trace(if (test) Serial<<"sub changed!"<<endl);
+//           return true;
+//         }
+//       }
+//     }
+//   }
+//   if (clear) {
+//     #ifdef MENU_DEBUG
+//     if(changed(nav,out,sub,true)) {
+//       Serial<<"\nERROR clear changed fail!"<<endl;
+//       Serial<<*this<<endl;
+//       Serial<<"level:"<<nav.root->level<<endl;
+//       // Serial<<"type:"<<type()<<endl;
+//       Serial.flush();
+//       // while(1);
+//       return false;
+//     }
+//     #endif
+//     return true;
+//   } else return false;
+// }