Merge branch 'master' into pu/fb-setmode

This commit is contained in:
M. Liebmann
2017-03-20 00:00:35 +01:00
7 changed files with 137 additions and 125 deletions

View File

@@ -197,6 +197,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
val += 2;
else
val = 100;
(*value[selected]) = (uint8_t)val;
paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true);
setColor();
@@ -211,6 +212,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
val -= 2;
else
val = 0;
(*value[selected]) = (uint8_t)val;
paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true);
setColor();