From c6ce2a66705752f158e77be7b2f0c2569fe23d4f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 20 Nov 2016 18:34:54 +0100 Subject: [PATCH] Revert "- helpbox/hintbox: use proven font FONT_TYPE_MENU instead of FONT_TYPE_INFOBAR_INFO" This reverts commit 994d817bd27000308cb59a2e7f06077cf5b178ee. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/aff78dd6ecfd0b63a8c2e2daa0eaa4faee91f7ad Author: vanhofen Date: 2016-11-20 (Sun, 20 Nov 2016) ------------------ This commit was generated by Migit --- src/gui/widget/helpbox.cpp | 2 +- src/gui/widget/hintbox.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/widget/helpbox.cpp b/src/gui/widget/helpbox.cpp index 440896898..66cd9d4f2 100644 --- a/src/gui/widget/helpbox.cpp +++ b/src/gui/widget/helpbox.cpp @@ -54,7 +54,7 @@ Helpbox::Helpbox( const string& Title, hbox_font = default_font_text; if (default_font_text == NULL) - hbox_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]; //NI + hbox_font = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]; if (!Default_Text.empty()) addLine(Default_Text.c_str(), Default_Text, text_mode, line_space, HELPBOX_DEFAULT_LINE_INDENT ,hbox_font); diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index e49bc6fc7..eeda08a24 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -132,7 +132,7 @@ void CHintBox::init(const std::string& Text, const int& Width, const std::string timeout = HINTBOX_DEFAULT_TIMEOUT; w_indentation = indent; - hb_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]; //NI + hb_font = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]; //enable shadow shadow = true; @@ -321,7 +321,7 @@ void CHintBox::setMsgText(const std::string& Text, const uint& hint_id, const in CComponentsInfoBox *obj_text = static_cast(ccw_body->getCCItem(id)); //set required font and line size - Font* font = font_text == NULL ? g_Font[SNeutrinoSettings::FONT_TYPE_MENU] : font_text; //NI + Font* font = font_text == NULL ? g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO] : font_text; if (obj_text) obj_text->setText(Text, mode, font, color_text, style); }