Merge branch 'master' of github.com:neu-rah/ArduinoMenu

neu-rah · neu-rah · commit 5c2021406f61 · 2019-08-14T08:18:51.000Z
diff --git a/RnD/functor/test/README b/RnD/functor/test/README
diff --git a/src/plugin/SDMenu.h b/src/plugin/SDMenu.h
@@ -236,6 +236,7 @@ class SDMenuT:public menuNode,public FS {
       // return out.printRaw(SDMenuT<FS>::dir.name(),len);
     }
     //drawing options
+    out.setColor(fgColor, sel);
     idx_t i=out.tops[root.level]+idx;
     if (i<USE_BACKDOTS) len-=out.printRaw("[..]",len);
     else len-=out.printRaw(SDMenuT<FS>::entry(out.tops[root.level]+idx-USE_BACKDOTS).c_str(),len);
diff --git a/src/plugin/SdFatMenu.h b/src/plugin/SdFatMenu.h
@@ -247,6 +247,7 @@ class SDMenuT:public menuNode,public FS {
       // return out.printRaw(SDMenuT<FS>::dir.name(),len);
     }
     //drawing options
+    out.setColor(fgColor, sel);
     idx_t i=out.tops[root.level]+idx;
     if (i<USE_BACKDOTS) len-=out.printRaw("[..]",len);
     else len-=out.printRaw(SDMenuT<FS>::entry(out.tops[root.level]+idx-USE_BACKDOTS).c_str(),len);

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,7 @@ class SDMenuT:public menuNode,public FS {`
`236`	`236`	`// return out.printRaw(SDMenuT<FS>::dir.name(),len);`
`237`	`237`	`}`
`238`	`238`	`//drawing options`
	`239`	`+ out.setColor(fgColor, sel);`
`239`	`240`	`idx_t i=out.tops[root.level]+idx;`
`240`	`241`	`if (i<USE_BACKDOTS) len-=out.printRaw("[..]",len);`
`241`	`242`	`else len-=out.printRaw(SDMenuT<FS>::entry(out.tops[root.level]+idx-USE_BACKDOTS).c_str(),len);`
Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,7 @@ class SDMenuT:public menuNode,public FS {`
`247`	`247`	`// return out.printRaw(SDMenuT<FS>::dir.name(),len);`
`248`	`248`	`}`
`249`	`249`	`//drawing options`
	`250`	`+ out.setColor(fgColor, sel);`
`250`	`251`	`idx_t i=out.tops[root.level]+idx;`
`251`	`252`	`if (i<USE_BACKDOTS) len-=out.printRaw("[..]",len);`
`252`	`253`	`else len-=out.printRaw(SDMenuT<FS>::entry(out.tops[root.level]+idx-USE_BACKDOTS).c_str(),len);`