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

CHintBox: try to fix truncated chars

Browse Source 
Last chars were truncated. Indent and titel text were not considered.


Origin commit data
------------------
Commit: 7f5a576795
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
This commit is contained in:
Thilo Graf
2016-11-11 21:09:25 +01:00
parent dc607fd1df
commit 9ea70e4ea7
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,7 @@ void CHintBox::init(const std::string& Text, const int& Width, const std::string
showHeader(false); showHeader(false);
//set required window width and basic height, consider existent header instance and its caption width //set required window width and basic height, consider existent header instance and its caption width
width = getMaxWidth(Text, hb_font, Width); width = getMaxWidth(Text, ccw_caption, hb_font, Width);
height = max(HINTBOX_MIN_HEIGHT, min(HINTBOX_MAX_HEIGHT, height)); height = max(HINTBOX_MIN_HEIGHT, min(HINTBOX_MAX_HEIGHT, height));
ccw_buttons = header_buttons; ccw_buttons = header_buttons;
@@ -277,7 +277,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
height = max(height, HINTBOX_MIN_HEIGHT); height = max(height, HINTBOX_MIN_HEIGHT);
/* get current maximal width and refresh window items */ /* get current maximal width and refresh window items */
width = getMaxWidth(Text, item_font, width); width = getMaxWidth(Text, ccw_caption, item_font, width);
/* initialize infobox as container for text and possible picon*/ /* initialize infobox as container for text and possible picon*/
CComponentsInfoBox *info_box = new CComponentsInfoBox( 0, CComponentsInfoBox *info_box = new CComponentsInfoBox( 0,
@@ -366,9 +366,15 @@ void CHintBox::scroll_down(const uint& hint_id)
Scroll(true, hint_id); Scroll(true, hint_id);
} }
int CHintBox::getMaxWidth(const string& Text, Font *font, const int& minWidth) int CHintBox::getMaxWidth(const string& Text, const string& Title, Font *font, const int& minWidth)
{ {
return max(HINTBOX_MIN_WIDTH, max(minWidth+w_indentation, min(CTextBox::getMaxLineWidth(Text, font)+w_indentation, (int)frameBuffer->getScreenWidth()))); int res = max(HINTBOX_MIN_WIDTH, max(minWidth+2*w_indentation, min(CTextBox::getMaxLineWidth(Text, font)+2*w_indentation, (int)frameBuffer->getScreenWidth())));
if (ccw_show_header){
initHeader();
return max(res, ccw_head->getCaptionFont()->getRenderWidth(Title) + 2*w_indentation);
}
return res;
} }
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)

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

@@ -80,7 +80,7 @@ class CHintBox : public CComponentsWindow
virtual void ReSize(); virtual void ReSize();
void showTimeOutBar(){enableTimeOutBar();} void showTimeOutBar(){enableTimeOutBar();}
int getMaxWidth(const std::string& Text, Font *font, const int& minWidth); int getMaxWidth(const std::string& Text, const std::string& Title, Font *font, const int& minWidth);
public: public:
/**CHintBox Constructor /**CHintBox Constructor