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

Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
This commit is contained in:
vanhofen
2017-02-09 20:22:37 +01:00
12 changed files with 255 additions and 146 deletions

View File

@@ -425,7 +425,13 @@ void Font::RenderString(int x, int y, const int width, const char *text, const f
return;
const bool utf8_encoded = flags & IS_UTF8;
#if HAVE_TRIPLEDRAGON
/* the TD Framebufffer is ARGB; the others are BGRA. The fullbg code does not handle that
* the quick workaround is to just disable the fullbg flag */
useFullBG = false;
#else
useFullBG = flags & FULLBG;
#endif
/*
useFullBg = false
fetch bgcolor from framebuffer, using lower left edge of the font