@@ -479,31 +479,31 @@ void menuVariantBase::doNav(navNode& nav,navCmd cmd) {
479479
480480template <bool clear>
481481bool menuNode::_changes (const navNode &nav,const menuOut& out,bool sub,bool test) {
482- _trace (Serial<<*this <<" menuNode::" <<(clear?" clearChanged" :" changed" )<<" test:" <<test<<endl);
482+ trace (Serial<<*this <<" menuNode::" <<(clear?" clearChanged" :" changed" )<<" test:" <<test<<endl);
483483 if (clear) dirty=false ;
484484 else if (dirty) {
485- _trace (if (test) Serial<<" just dirty!" <<endl);
485+ trace (if (test) Serial<<" just dirty!" <<endl);
486486 return true ;
487487 }
488488 if (has ((systemStyles)(_asPad|_parentDraw))) {
489489 for (int i=0 ;i<sz ();i++)
490490 if (clear) operator [](i).clearChanged (nav,out,false );
491491 else if (operator [](i).changed (nav,out,false ,test)) {
492- _trace (if (test) Serial<<" APPD! " <<operator [](i)<<endl);
492+ trace (if (test) Serial<<" APPD! " <<operator [](i)<<endl);
493493 return true ;
494494 }
495495 } else {
496496 // if (!(nav.target==this&&sub)) return;???
497497 if (!(clear||(nav.target ==this &&sub))) {
498- _trace (if (test&&dirty) Serial<<" indirect!" <<endl);
498+ trace (if (test&&dirty) Serial<<" indirect!" <<endl);
499499 return dirty;// second hand check, just report self
500500 }
501501 idx_t level=nav.root ->level ;
502502 if (parentDraw ()) {
503503 if (clear) nav.root ->path [level-1 ].target ->clearChanged (nav.root ->path [level-1 ],out,sub);
504504 else {
505- _trace (Serial<<" return changed of parent-draw element" <<endl);
506- _trace (if (test) Serial<<" parentDraw()!" <<endl);
505+ trace (Serial<<" return changed of parent-draw element" <<endl);
506+ trace (if (test) Serial<<" parentDraw()!" <<endl);
507507 return nav.root ->path [level-1 ].target ->changed (nav.root ->path [level-1 ],out,sub,test);
508508 }
509509 }
@@ -513,14 +513,14 @@ bool menuNode::_changes(const navNode &nav,const menuOut& out,bool sub,bool test
513513 // idx_t lev=level-(nav.root->navFocus->has(_parentDraw)&&(nav.root->navFocus->isMenu()||nav.root->navFocus->has(_asPad)));
514514 // idx_t t=out.tops[lev];
515515 idx_t t=out.tops [level];// -nav.root->navFocus->has(_parentDraw)&&has(_asPad)];
516- _trace (Serial<<" t:" <<t<<endl;);
516+ trace (Serial<<" t:" <<t<<endl;);
517517 if (sub) for (int i=0 ;i<my;i++,t++) {
518518 if (t>=sz ()) break ;
519519 if (clear) operator [](t).clearChanged (nav,out,false );
520520 {
521- _trace (Serial<<" checking:" <<operator [](t)<<endl);
521+ trace (Serial<<" checking:" <<operator [](t)<<endl);
522522 if (operator [](t).changed (nav,out,false ,test)) {
523- _trace (if (test) Serial<<" sub changed!" <<endl);
523+ trace (if (test) Serial<<" sub changed!" <<endl);
524524 return true ;
525525 }
526526 }
0 commit comments