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

CComponentsHeader: cleanup

Browse Source 
-remove variable userHeight, is not used
-change name of parameter in member initCaptionFont(), "font_name" is not a
 suitable name for a type object.
This commit is contained in:
Thilo Graf
2014-01-24 23:36:24 +01:00
parent d35da1afb6
commit 1838a71c20
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/gui/components/cc_frm_header.cpp
View File

@@ -83,17 +83,11 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
//init header width //init header width
width = w == 0 ? frameBuffer->getScreenWidth(true) : w; width = w == 0 ? frameBuffer->getScreenWidth(true) : w;
//init header height //init header default height
cch_size_mode = CC_HEADER_SIZE_LARGE; height = max(h, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight());
cch_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
if (h > 0) { cch_size_mode = CC_HEADER_SIZE_LARGE;
userHeight = true; initCaptionFont(); //sets cch_font and calculate height if required;
height = h;
}
else{
userHeight = false;
height = cch_font->getHeight();
}
shadow = has_shadow; shadow = has_shadow;
col_frame = color_frame; col_frame = color_frame;
@@ -145,10 +139,29 @@ void CComponentsHeader::setCaption(neutrino_locale_t caption_locale, const int&
cch_caption_align = align_mode; cch_caption_align = align_mode;
} }
void CComponentsHeader::setCaptionFont(Font* font_name) void CComponentsHeader::setCaptionFont(Font* font)
{ {
cch_font = font_name; initCaptionFont(font); //cch_font = font
height = std::max(height, cch_font->getHeight()); }
void CComponentsHeader::initCaptionFont(Font* font)
{
Font *l_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
Font *s_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU];
if (font == NULL){
cch_font = (cch_size_mode == CC_HEADER_SIZE_LARGE? l_font : s_font);
//select matching height
if (cch_size_mode == CC_HEADER_SIZE_LARGE)
height = std::max(height, l_font->getHeight());
else
height = std::min(height, s_font->getHeight());
}
else{
cch_font = font;
height = std::max(height, cch_font->getHeight());
}
} }
void CComponentsHeader::setIcon(const char* icon_name) void CComponentsHeader::setIcon(const char* icon_name)
@@ -378,10 +391,7 @@ void CComponentsHeader::initCaption()
void CComponentsHeader::initCCItems() void CComponentsHeader::initCCItems()
{ {
//set size //set size
if (!userHeight) { initCaptionFont();
cch_font = (cch_size_mode == CC_HEADER_SIZE_LARGE? g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE] : g_Font[SNeutrinoSettings::FONT_TYPE_MENU]);
height = cch_font->getHeight();
}
//init icon //init icon
initIcon(); initIcon();

8
src/gui/components/cc_frm_header.h
View File

@@ -89,8 +89,8 @@ class CComponentsHeader : public CComponentsForm
///property: alignment of caption within header, see also setCaptionAlignment(), possible values are CTextBox::CENTER, default = CTextBox::NO_AUTO_LINEBREAK (left) ///property: alignment of caption within header, see also setCaptionAlignment(), possible values are CTextBox::CENTER, default = CTextBox::NO_AUTO_LINEBREAK (left)
int cch_caption_align; int cch_caption_align;
bool userHeight; ///init font object and recalculates height if required
void initCaptionFont(Font* font = NULL);
///sub: init icon object ///sub: init icon object
void initIcon(); void initIcon();
///sub: init caption object ///sub: init caption object
@@ -130,7 +130,7 @@ class CComponentsHeader : public CComponentsForm
///set alignment of caption within header, possible paramters are CTextBox::CENTER, CTextBox::NO_AUTO_LINEBREAK ///set alignment of caption within header, possible paramters are CTextBox::CENTER, CTextBox::NO_AUTO_LINEBREAK
virtual void setCaptionAlignment(const int& align_mode){cch_caption_align = align_mode;}; virtual void setCaptionAlignment(const int& align_mode){cch_caption_align = align_mode;};
///set text font object for caption ///set text font object for caption
virtual void setCaptionFont(Font* font_name); virtual void setCaptionFont(Font* font);
///set text color for caption ///set text color for caption
virtual void setCaptionColor(fb_pixel_t text_color){cch_col_text = text_color;}; virtual void setCaptionColor(fb_pixel_t text_color){cch_col_text = text_color;};
@@ -165,7 +165,7 @@ class CComponentsHeader : public CComponentsForm
CC_HEADER_SIZE_SMALL = 1 CC_HEADER_SIZE_SMALL = 1
}; };
///set size of header, possible values are CC_HEADER_SIZE_LARGE, CC_HEADER_SIZE_SMALL ///set size of header, possible values are CC_HEADER_SIZE_LARGE, CC_HEADER_SIZE_SMALL
virtual void setSizeMode(const int& size_mode){cch_size_mode = size_mode;}; virtual void setSizeMode(const int& size_mode){cch_size_mode = size_mode; initCCItems();};
///init all items within header object ///init all items within header object
virtual void initCCItems(); virtual void initCCItems();