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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e8fde7b21
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:56:34 +02:00
6 changed files with 24 additions and 24 deletions

View File

@@ -2618,8 +2618,8 @@ void CInfoViewer::ecmInfoBox_show(const char * txt, int w, int h, Font * font)
//set new window dimensions
int h_offset = 5;
int w_offset = 10;
ecmInfoBox->setWidth(min(max_w, w + 2*w_offset));
ecmInfoBox->setHeight(min(max_h, h_header + h + 2*h_offset));
ecmInfoBox->setWidth(std::min(max_w, w + 2*w_offset));
ecmInfoBox->setHeight(std::min(max_h, h_header + h + 2*h_offset));
ecmInfoBox->Refresh();
//calc window position