Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-19 23:08:41 +02:00
17 changed files with 301 additions and 287 deletions

View File

@@ -336,7 +336,7 @@ void CComponentsFooter::paintButtons(const int& x_pos,
this->setDimensionsAll(x_pos, y_pos, w, h);
this->setButtonFont(font);
this->setContextButton(context_buttons);
this->setButtonLabels(content, label_count, 0, label_width);
this->setButtonLabels(content, label_count, 0, label_width ? label_width : w/label_count);
this->paint(do_save_bg);
}