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: optimize dynamic window width bahavior on different line sizes

Browse Source 
Width calculation is now depends on largest line of text.
This commit is contained in:
Thilo Graf
2016-11-10 00:34:00 +01:00
parent 91c7588aa6
commit 0952efaba4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,12 +133,6 @@ void CHintBox::init(const std::string& Text, const int& Width, const std::string
hb_font = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]; hb_font = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO];
//set required window width and basic height
width = getMaxWidth(Text, hb_font, Width);
height = max(HINTBOX_MIN_HEIGHT, min(HINTBOX_MAX_HEIGHT, height));
ccw_buttons = header_buttons;
//enable shadow //enable shadow
shadow = true; shadow = true;
@@ -146,6 +140,12 @@ void CHintBox::init(const std::string& Text, const int& Width, const std::string
if (ccw_caption.empty()) if (ccw_caption.empty())
showHeader(false); showHeader(false);
//set required window width and basic height, consider existent header instance and its caption width
width = getMaxWidth(Text, hb_font, Width);
height = max(HINTBOX_MIN_HEIGHT, min(HINTBOX_MAX_HEIGHT, height));
ccw_buttons = header_buttons;
//disable footer for default //disable footer for default
showFooter(false); showFooter(false);
@@ -276,7 +276,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
height = min(HINTBOX_MAX_HEIGHT, (ccw_head ? ccw_head->getHeight() : 0)+ h_hint_obj); height = min(HINTBOX_MAX_HEIGHT, (ccw_head ? ccw_head->getHeight() : 0)+ h_hint_obj);
height = max(height, HINTBOX_MIN_HEIGHT); height = max(height, HINTBOX_MIN_HEIGHT);
/* get current maximal width and refresh window items TODO: required maximal width*/ /* get current maximal width and refresh window items */
width = getMaxWidth(Text, item_font, width); width = getMaxWidth(Text, item_font, width);
/* initialize infobox as container for text and possible picon*/ /* initialize infobox as container for text and possible picon*/
@@ -368,7 +368,7 @@ void CHintBox::scroll_down(const uint& hint_id)
int CHintBox::getMaxWidth(const string& Text, Font *font, const int& minWidth) int CHintBox::getMaxWidth(const string& Text, Font *font, const int& minWidth)
{ {
return max(HINTBOX_MIN_WIDTH, max(minWidth+w_indentation, min(font->getRenderWidth(Text)+w_indentation, (int)frameBuffer->getScreenWidth()))); return max(HINTBOX_MIN_WIDTH, max(minWidth+w_indentation, min(CTextBox::getMaxLineWidth(Text, font)+w_indentation, (int)frameBuffer->getScreenWidth())));
} }
int ShowHint(const char * const Caption, const char * const Text, const int Width, int timeout, const char * const Icon, const char * const Picon, const int& header_buttons) int ShowHint(const char * const Caption, const char * const Text, const int Width, int timeout, const char * const Icon, const char * const Picon, const int& header_buttons)