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

CHintBox: add member to get maximal required width

Browse Source 
Origin commit data
------------------
Commit: 4bdd5e11a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)
This commit is contained in:
Thilo Graf
2016-10-31 21:38:06 +01:00
parent 1523582d35
commit 0704180bf9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,7 +259,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
//set required font and line size //set required font and line size
hb_font = !font_text ? hb_font : font_text; hb_font = !font_text ? hb_font : font_text;
width = max(width, min(hb_font->getRenderWidth(Text), HINTBOX_MIN_WIDTH)); width = getMaxWidth(Text, width);
int h_line = hb_font->getHeight(); int h_line = hb_font->getHeight();
//init side picon object //init side picon object
@@ -439,6 +439,11 @@ void CHintBox::scroll_down(const uint& hint_id)
Scroll(true, hint_id); Scroll(true, hint_id);
} }
int CHintBox::getMaxWidth(const string& Text, const int& minWidth)
{
return max(HINTBOX_MIN_WIDTH, max(minWidth, min(hb_font->getRenderWidth(Text), (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)
{ {
int res = messages_return::none; int res = messages_return::none;

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

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