mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

CHintBox: try to optimize height and width of message window

Browse Source
This commit is contained in:
Thilo Graf
2016-10-23 21:39:17 +02:00
parent 21e8188b5b
commit a5ce26dfd9
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@
Copyright (C) 2008-2009, 2011, 2013 Stefan Seyfried Copyright (C) 2008-2009, 2011, 2013 Stefan Seyfried
Implementation of CComponent Window class. Implementation of CComponent Window class.
Copyright (C) 2014-2015 Thilo Graf 'dbt' Copyright (C) 2014-2016 Thilo Graf 'dbt'
License: GPL License: GPL
@@ -133,8 +133,10 @@ void CHintBox::init(const std::string& Text, const int& Width, const std::string
w_indentation = indent; w_indentation = indent;
hb_text_mode = text_mode; hb_text_mode = text_mode;
hb_font = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO];
//set required window width and basic height //set required window width and basic height
width = max(HINTBOX_MIN_WIDTH, Width); width = max(HINTBOX_MIN_WIDTH, max(Width, min(hb_font->getRenderWidth(Text), (int)frameBuffer->getScreenWidth())));
height = max(HINTBOX_MIN_HEIGHT, height); height = max(HINTBOX_MIN_HEIGHT, height);
ccw_buttons = header_buttons; ccw_buttons = header_buttons;
@@ -250,9 +252,9 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
dprintf(DEBUG_INFO, "[CHintBox] [%s - %d] add new hint '%s' %s\n", __func__, __LINE__, Text.c_str(), Picon.c_str()); dprintf(DEBUG_INFO, "[CHintBox] [%s - %d] add new hint '%s' %s\n", __func__, __LINE__, Text.c_str(), Picon.c_str());
//set required font and line size //set required font and line size
Font* font = font_text == NULL ? g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO] : font_text; hb_font = !font_text ? hb_font : font_text;
width = max(width, min(font->getRenderWidth(Text), HINTBOX_MIN_WIDTH)); width = max(width, min(hb_font->getRenderWidth(Text), HINTBOX_MIN_WIDTH));
int h_line = font->getHeight(); int h_line = hb_font->getHeight();
//init side picon object //init side picon object
CComponentsPicture *obj_picon = new CComponentsPicture(0, timeout > 0 ? TIMEOUT_BAR_HEIGHT : 0, Picon); CComponentsPicture *obj_picon = new CComponentsPicture(0, timeout > 0 ? TIMEOUT_BAR_HEIGHT : 0, Picon);
@@ -270,14 +272,15 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
h_text_obj, h_text_obj,
Text, Text,
text_mode, text_mode,
font); hb_font);
//provide the internal textbox object //provide the internal textbox object
CTextBox *textbox = obj_text->getCTextBoxObject(); CTextBox *textbox = obj_text->getCTextBoxObject();
int lines_count = textbox->getLines(); int lines_count = textbox->getLines();
//get required height of text object related to lines count and height of head and footer, if available //get required height of text object related to height of current text object, header and footer
int h_required = lines_count * h_line + (ccw_head ? ccw_head->getHeight() : 0) + (ccw_footer ? ccw_footer->getHeight() : 0); int fh_h = (ccw_head ? ccw_head->getHeight() : 0) + (ccw_footer ? ccw_footer->getHeight() : 0) + obj_text->getHeight();
int h_required = min( max(height,fh_h), (int)frameBuffer->getScreenHeight()) ;//lines_count * h_line + (ccw_head ? ccw_head->getHeight() : 0) + (ccw_footer ? ccw_footer->getHeight() : 0);
//set minimal required height //set minimal required height
height = max(height, min(HINTBOX_MAX_HEIGHT, max(HINTBOX_MIN_HEIGHT, h_required))); height = max(height, min(HINTBOX_MAX_HEIGHT, max(HINTBOX_MIN_HEIGHT, h_required)));

2
src/gui/widget/hintbox.h
View File

@@ -57,6 +57,8 @@ class CHintBox : public CComponentsWindow
int w_indentation; int w_indentation;
int hb_text_mode; int hb_text_mode;
Font* hb_font;
///global count of lines ///global count of lines
uint lines; uint lines;