Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
This commit is contained in:
Jacek Jendrzej
2017-10-16 13:17:17 +02:00
20 changed files with 360 additions and 423 deletions

View File

@@ -1552,7 +1552,7 @@ void CMenuWidget::setFooter(const struct button_label *_fbutton_labels, const in
if (!footer)
footer = new CComponentsFooter(x, y + height, width + scrollbar_width, 0, 0, NULL, CC_SHADOW_ON);
footer->setWidth(width + scrollbar_width);
footer->setButtonLabels(fbutton_labels, fbutton_count, 0, width/fbutton_count);
footer->setButtonLabels(fbutton_labels, fbutton_count);
footer_height = footer->getHeight();
footer_width = footer->getWidth();
}else{