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

CComponentsButton: ignonre objects if no inititalized

Browse Source 
This makes it possible to use buttons with or without icons or text
This commit is contained in:
Thilo Graf
2014-05-01 21:18:06 +02:00
parent 2bde5a6d08
commit 95c7e44eb1
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/components/cc_frm_button.cpp
View File

@@ -164,7 +164,10 @@ void CComponentsButton::initCaption()
} }
//handle common position of icon and text inside container required for alignment //handle common position of icon and text inside container required for alignment
int w_required = fr_thickness + append_x_offset + cc_btn_icon_obj->getWidth() + append_x_offset + cc_btn_font->getRenderWidth(cc_btn_capt, true) + append_x_offset + fr_thickness; int w_required = fr_thickness + append_x_offset;
w_required += cc_btn_icon_obj ? cc_btn_icon_obj->getWidth() + append_x_offset : 0;
w_required += cc_btn_font ? cc_btn_font->getRenderWidth(cc_btn_capt, true) : 0;
w_required += append_x_offset + fr_thickness;
//dynamic width //dynamic width
if (w_required > width){ if (w_required > width){
@@ -173,11 +176,18 @@ void CComponentsButton::initCaption()
} }
//do center //do center
int x_icon = width/2 - w_required/2 + fr_thickness + append_x_offset; int x_icon = width/2 - w_required/2 /*+ fr_thickness + append_x_offset*/;
int w_icon = 0;
if (cc_btn_icon_obj){
x_icon += fr_thickness + append_x_offset;
cc_btn_icon_obj->setXPos(x_icon); cc_btn_icon_obj->setXPos(x_icon);
cc_btn_capt_obj->setXPos(x_icon + cc_btn_icon_obj->getWidth() + append_x_offset); w_icon = cc_btn_icon_obj->getWidth();
}
if (cc_btn_capt_obj){
cc_btn_capt_obj->setXPos(x_icon + w_icon + append_x_offset);
cc_btn_capt_obj->setWidth(width - cc_btn_capt_obj->getXPos()); cc_btn_capt_obj->setWidth(width - cc_btn_capt_obj->getXPos());
} }
}
void CComponentsButton::setCaption(const std::string& text) void CComponentsButton::setCaption(const std::string& text)
{ {