From 64ff06def7279356ab350bc58c1db2c4046ba4e5 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Mon, 30 Jan 2017 07:15:12 +0100 Subject: [PATCH 1/2] Revert "configure.ac: Fix freetype check" This reverts commit 46cf08e884fd08d8b2d802625ce17d0d5ee9bb64. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a84b07ee86a201b022a355bbef48f87b6f279b9e Author: Michael Liebmann Date: 2017-01-30 (Mon, 30 Jan 2017) ------------------ This commit was generated by Migit --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8678dd720..6f6606da4 100644 --- a/configure.ac +++ b/configure.ac @@ -93,7 +93,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl) TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2) AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher]) AC_TRY_CPP([ - #include + #include #include FT_FREETYPE_H #if FREETYPE_MAJOR < 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 5) #error Freetype version too low. From 798f081c82c4a7e1ec86e261b851ad8252eaa51b Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 30 Jan 2017 11:00:53 +0100 Subject: [PATCH 2/2] CMenuWidget: ensure repaint of all header content if it is already painted TODO: This should be controlled inside header base class. paint() method seems suitable. I Will try to implement it soon. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a72f3a78678b42c0cd21d54f261d6491a929a6e8 Author: Thilo Graf Date: 2017-01-30 (Mon, 30 Jan 2017) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 843e39481..d51ab7b0c 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1257,6 +1257,8 @@ void CMenuWidget::paint() header->setCaptionColor(COL_MENUHEAD_TEXT); header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0); header->enableGradientBgCleanUp(savescreen); + if (header->isPainted()) + header->kill(header->getColorBody()); header->paint(CC_SAVE_SCREEN_NO); // paint body shadow