mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-03-20 00:00:35 +01:00
parent 2de98df48f b8a97a97ca
commit be49686432
7 changed files with 137 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/neutrinofonts.cpp
View File

@@ -272,10 +272,12 @@ int CNeutrinoFonts::getDynFontSize(int dx, int dy, std::string text, int style)
if (text.empty()) tmpText = "x";
_width = dynFont->getRenderWidth(tmpText);
if ((_height > dy) || (_width > dx)) {
if (dynFlag)
if (dynFlag){
dynSize--;
else
printf("##### [%s] Specified size (dx=%d, dy=%d) too small, use minimal font size.\n", __FUNCTION__, dx, dy);
}else{
if (debug)
printf("##### [%s] Specified size (dx=%d, dy=%d) too small, use minimal font size.\n", __FUNCTION__, dx, dy);
}
break;
}
else if ((_height < dy) || (_width < dx)) {