From a4da9d28a958f4ebdb30a17dc22f9ca13939ad9c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 4 Dec 2017 20:14:02 +0100 Subject: [PATCH] widget/hintbox.cpp: add explicit init of var picon Had some issues while compile with gcc 7.x. Exact data type was expected. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/882a4654a829453fc9b7df58407997fd7fb601f6 Author: Thilo Graf Date: 2017-12-04 (Mon, 04 Dec 2017) --- src/gui/widget/hintbox.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index ec9cd854e..73142b895 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -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*/