mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b6265c2a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-27 18:49:08 +01:00
parent f9a197c97e 806ec2a0de
commit 01da122686
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -91,6 +91,18 @@ AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
# TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl) # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl) TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2) TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2)
AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher])
AC_TRY_CPP([
#include <ft2build.h>
#include FT_FREETYPE_H
#if FREETYPE_MAJOR < 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 5)
#error Freetype version too low.
#endif
],
[AC_MSG_RESULT(yes)],
[AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher])
])
# fallback to curl-config (which is ugly for cross-compilation) # fallback to curl-config (which is ugly for cross-compilation)
if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then
TUXBOX_APPS_LIB_CONFIG(CURL,curl-config) TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)

1
src/gui/volumebar.cpp
View File

@@ -215,6 +215,7 @@ void CVolumeBar::initVolumeBarDigit()
vb_digit->setDimensionsAll(vb_digit_x, 0, vb_digit_w, height); vb_digit->setDimensionsAll(vb_digit_x, 0, vb_digit_w, height);
vb_digit->setTextColor(COL_MENUCONTENT_TEXT); vb_digit->setTextColor(COL_MENUCONTENT_TEXT);
vb_digit->setCorner(cornerRad(), CORNER_RIGHT); vb_digit->setCorner(cornerRad(), CORNER_RIGHT);
vb_digit->doPaintTextBoxBg(true);
initVolumeBarDigitValue(); initVolumeBarDigitValue();
//add digit label to container //add digit label to container