Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	src/gui/volumebar.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd8b9f9b04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-29 22:37:31 +01:00
6 changed files with 41 additions and 31 deletions

View File

@@ -1093,6 +1093,8 @@ void CMenuWidget::hide()
header->kill();
if (info_box)
info_box->kill();
if (details_line)
details_line->hide();
frameBuffer->paintBackgroundBoxRel(x, y, full_width, full_height + fbutton_height);
//paintHint(-1);
}