Skip to content

Commit 75b3f32

Browse files
authored
Merge pull request #65 from christophepersoz/patch-4
valuecolor correction from master branch
2 parents f506a0a + efd4292 commit 75b3f32

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

src/menuFields.h

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,18 @@ v2.0 - Calling action on every elements
6868
return true;
6969
}*/
7070
}
71-
virtual void printTo(menuOut& p) {
72-
print_P(p,text);
71+
virtual void printName(menuOut& p) {
72+
//if (!enabled) p.print('*');
73+
print_P(p,text);
7374
p.print(activeNode==this?(tunning?'>':':'):' ');
74-
p.print(value);
75-
print_P(p,units);
7675
}
76+
virtual void printValue(menuOut& p) {p.print(value);}
77+
virtual void printUnit(menuOut& p) {print_P(p,units);}
78+
virtual void printTo(menuOut& p) {
79+
printName(p);
80+
printValue(p);
81+
printUnit(p);
82+
}
7783
void clamp() {
7884
if (value<low) value=low;
7985
#ifdef ONLY_UP_KEY
@@ -151,12 +157,17 @@ v2.0 - Calling action on every elements
151157
if (((menuValue<T>*)pgmPtrNear(data[n]))->value==target)
152158
sel=n;
153159
}
160+
virtual void printName(menuOut& p) {
161+
print_P(p,text);
162+
p.print(' ');
163+
}
164+
virtual void printValue(menuOut& p) {
165+
menuVariant<T>::sync();
166+
((prompt*)pgmPtrNear(data[sel]))->printTo(p);
167+
}
154168
virtual void printTo(menuOut& p) {
155-
menuVariant<T>::sync();
156-
print_P(p,text);
157-
p.print(' ');
158-
((prompt*)pgmPtrNear(data[sel]))->printTo(p);
159-
//print_P(p,((menuValue<T>*)pgmPtrNear(data[sel]))->text);
169+
printName(p);
170+
printValue(p);
160171
}
161172
};
162173

0 commit comments

Comments
 (0)