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: add member initCCButtonFormSize()

Browse Source 
This moves caclulation from initCCHeaderButtons() to its own
member.
This commit is contained in:
Thilo Graf
2012-11-24 22:31:00 +01:00
parent 62f44d7a8c
commit 41165d7cb2
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/components/cc.h
View File

@@ -506,6 +506,7 @@ class CComponentsHeader : public CComponentsForm
void initCCHeaderButtons(); void initCCHeaderButtons();
void initCCHItems(); void initCCHItems();
void initCCHDefaultButtons(); void initCCHDefaultButtons();
void initCCButtonFormSize();
protected: protected:
void initVarHeader(); void initVarHeader();

20
src/gui/components/components.cpp
View File

@@ -1831,6 +1831,17 @@ void CComponentsHeader::initCCHDefaultButtons()
v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_MENU); v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_MENU);
} }
// calculate minimal width of icon form
void CComponentsHeader::initCCButtonFormSize()
{
ccif_width = 0;
for(size_t i=0; i<v_cch_btn.size(); i++){
int bw, bh;
frameBuffer->getIconSize(v_cch_btn[i].c_str(), &bw, &bh);
ccif_width += (bw + cch_btn_offset);
}
}
void CComponentsHeader::initCCHeaderButtons() void CComponentsHeader::initCCHeaderButtons()
{ {
initCCHDefaultButtons(); initCCHDefaultButtons();
@@ -1839,14 +1850,7 @@ void CComponentsHeader::initCCHeaderButtons()
if (v_cch_btn.empty()) if (v_cch_btn.empty())
return; return;
// calculate minimal width of icon form initCCButtonFormSize();
size_t btncnt = v_cch_btn.size();
ccif_width = 0;
for(size_t i=0; i<btncnt; i++){
int bw, bh;
frameBuffer->getIconSize(v_cch_btn[i].c_str(), &bw, &bh);
ccif_width += (bw + cch_btn_offset);
}
cch_btn_obj = new CComponentsIconForm(); cch_btn_obj = new CComponentsIconForm();
cch_btn_obj->setDimensionsAll(0+width-ccif_width, 0, ccif_width-cch_btn_offset, height); cch_btn_obj->setDimensionsAll(0+width-ccif_width, 0, ccif_width-cch_btn_offset, height);