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

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

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: c35e647878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)
This commit is contained in:
vanhofen
2017-12-07 12:17:23 +01:00
parent 5d80f2d23a cdda705254
commit ee09aa2565
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/widget/hintbox.cpp
View File

@@ -265,6 +265,9 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
/* set required font and line height */
Font* item_font = !font_text ? hb_font : font_text;
/* set picon */
string picon = Picon;
/* pre define required info height depends of lines and minimal needed height*/
int line_breaks = CTextBox::getLines(Text);
int h_font = item_font->getHeight();
@@ -276,7 +279,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
int txt_mode = text_mode;
/* remove CENTER mode if picon defined */
if (!Picon.empty() && (txt_mode & CTextBox::CENTER)){
if (!picon.empty() && (txt_mode & CTextBox::CENTER)){
txt_mode &= ~CTextBox::CENTER;
}
@@ -313,7 +316,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
color_text);
/* define picon and disable bg */
info_box->setPicture(Picon);
info_box->setPicture(picon);
info_box->doPaintBg(false);
/* recalculate new hintbox dimensions and position*/