Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 11a28c07d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-04-19 21:35:56 +02:00
26 changed files with 217 additions and 460 deletions

View File

@@ -111,6 +111,9 @@ void CComponentsFooter::setButtonLabels(const struct button_label_cc * const con
if (chain)
chain->clear();
if (label_count == 0)
return;
/* set general available full basic space for button chain,
* in this case this is footer width
*/
@@ -372,7 +375,6 @@ void CComponentsFooter::paintButtons(const int& x_pos,
this->setButtonFont(font);
this->setContextButton(context_buttons);
this->setButtonLabels(content, label_count, 0, label_width);
this->paint(do_save_bg);
}