fix field clearChanged

now sets reflex=target() to avoid recursivity of changed()
this was causing repetitive redraw

Author: neu-rah

src/items.cpp

@@ -154,22 +154,31 @@ Used textField::printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len
 // menuNode - any menu object that has a list of members
 //
 ////////////////////////////////////////////////////////////////////////////////
-bool menuNode::changed(const navNode &nav,const menuOut& out,bool sub) {
+bool menuNode::changed(const navNode &nav,const menuOut& out,bool sub,bool test) {
   trace(Serial<<*this<<" menuNode::changed"<<endl);
-  if (dirty) return true;
+  if (dirty) {
+    trace(if (test) Serial<<"just dirty!"<<endl);
+    return true;
+  }
   bool appd=has((systemStyles)(_asPad|_parentDraw));
   if (appd) {
     trace(Serial<<"appd!"<<endl;);
     for(int i=0;i<sz();i++)
-      if (operator[](i).changed(nav,out,false))
+      if (operator[](i).changed(nav,out,false,test)) {
+        trace(if (test) Serial<<"APPD! "<<operator[](i).type()<<endl);
         return true;
+      }
   } else {
     trace(Serial<<*this<<"!appd"<<endl;);
-    if (!(nav.target==this&&sub)) return dirty;// second hand check, just report self
+    if (!(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()) {
       trace(Serial<<"return changed of parent-draw element"<<endl);
-      return nav.root->path[level-1].target->changed(nav.root->path[level-1],out,sub);
+      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);
@@ -181,7 +190,10 @@ bool menuNode::changed(const navNode &nav,const menuOut& out,bool sub) {
     if (sub) for(int i=0;i<my;i++,t++) {
       if (t>=sz()) break;
       trace(Serial<<"checking:"<<operator[](t)<<endl);
-      if (operator[](t).changed(nav,out,false)) return true;
+      if (operator[](t).changed(nav,out,false,test)) {
+        trace(if (test) Serial<<"sub changed!"<<endl);
+        return true;
+      }
     }
   }
   return false;
@@ -206,6 +218,16 @@ void menuNode::clearChanged(const navNode &nav,const menuOut& out,bool sub) {
       operator[](t).clearChanged(nav,out,false);
     }
   }
+  #ifdef DEBUG
+  if(changed(nav,out,sub,true)) {
+    Serial<<"ERROR clear changed fail!"<<endl;
+    Serial<<*this<<endl;
+    Serial<<"level:"<<nav.root->level<<endl;
+    Serial<<"type:"<<type()<<endl;
+    Serial.flush();
+    while(1);
+  }
+  #endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////

src/items.h

@@ -58,7 +58,7 @@
 
         virtual void clearChanged(const navNode &nav,const menuOut& out,bool sub) {dirty=false;}
         virtual Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr=0);//raw print to output device
-        virtual bool changed(const navNode &nav,const menuOut& out,bool sub=true) {return dirty;}
+        virtual bool changed(const navNode &nav,const menuOut& out,bool sub=true,bool test=false) {return dirty;}
         //this is the system version of enter handler, its used by elements like toggle
         virtual result sysHandler(SYS_FUNC_PARAMS) {return proceed;}
         virtual result eventHandler(eventMask e,navNode& nav,idx_t i) {
@@ -174,7 +174,13 @@
         inline T high() const {return ((menuFieldShadow<T>*)shadow)->_high();}
         inline T step() const {return ((menuFieldShadow<T>*)shadow)->_step();}
         inline T tune() const {return ((menuFieldShadow<T>*)shadow)->_tune();}
-        bool changed(const navNode &nav,const menuOut& out,bool sub=true) override {
+        virtual void clearChanged(const navNode &nav,const menuOut& out,bool sub) {
+          fieldBase::clearChanged(nav,out,sub);
+          reflex=target();
+        }
+        bool changed(const navNode &nav,const menuOut& out,bool sub=true,bool test=false) override {
+          trace(if (test&&dirty) Serial<<"field dirty"<<endl);
+          trace(if (test&&(reflex!=target())) Serial<<"reflex!=target reflex:"<<reflex<<" target:"<<target()<<endl);
           return dirty||(reflex!=target());
         }
         #ifdef DEBUG
@@ -228,7 +234,7 @@
           virtual classes type() const {return menuClass;}
         #endif
         inline prompt& operator[](idx_t i) const {return ((menuNodeShadow*)shadow)->operator[](i);}
-        bool changed(const navNode &nav,const menuOut& out,bool sub=true) override;
+        bool changed(const navNode &nav,const menuOut& out,bool sub=true,bool test=false) override;
         void clearChanged(const navNode &nav,const menuOut& out,bool sub) override;
         inline idx_t sz() const {return ((menuNodeShadow*)shadow)->_sz();}
         inline prompt* constMEM* data() const {return ((menuNodeShadow*)shadow)->_data();}
@@ -290,7 +296,7 @@
           return i;
         }
         inline T& target() const {return ((menuVariantShadow<T>*)shadow)->target();}
-        bool changed(const navNode &nav,const menuOut& out,bool sub=true) override;
+        bool changed(const navNode &nav,const menuOut& out,bool sub=true,bool test=false) override;
         #ifdef MENU_ASYNC
         virtual idx_t selected() const {return reflex;}
         #endif
@@ -425,7 +431,7 @@
     }
 
     template<typename T>
-    bool menuVariant<T>::changed(const navNode &nav,const menuOut& out,bool sub) {
+    bool menuVariant<T>::changed(const navNode &nav,const menuOut& out,bool sub,bool test) {
       return dirty||((menuValue<T>*)&operator[](reflex))->target()!=target();
     }