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

CComponentsButton: fix fit of button icon

Browse Source 
Scale was broken
This commit is contained in:
Thilo Graf
2015-01-14 19:32:10 +01:00
parent 51aab307c3
commit d33c4911d2
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,18 +145,25 @@ void CComponentsButton::initIcon()
if (cc_btn_icon_obj == NULL){ if (cc_btn_icon_obj == NULL){
int w_icon = 0; int w_icon = 0;
int h_icon = 0; int h_icon = 0;
frameBuffer->getIconSize(cc_btn_icon.c_str(), &w_icon, &h_icon); int y_icon = 0;
h_icon = min(height-2*fr_thickness, h_icon); string::size_type pos = cc_btn_icon.find("/", 0);
// if (h_icon != h_max){ if (pos == string::npos)
// int ratio = h_icon/h_max; cc_btn_icon = frameBuffer->getIconBasePath() + cc_btn_icon + ".png";
// cc_btn_icon = frameBuffer->getIconBasePath() + cc_btn_icon;
// cc_btn_icon += ".png"; cc_btn_icon_obj = new CComponentsPicture(fr_thickness, y_icon, cc_btn_icon, this);
// w_icon = w_icon*ratio; h_icon = cc_btn_icon_obj->getHeight();
// }
if (h_icon > (height-2*fr_thickness)){
int y_icon = height/2 - h_icon/2; cc_btn_icon_obj->setHeight(height*80/100);
cc_btn_icon_obj = new CComponentsPicture(fr_thickness, y_icon, w_icon, h_icon, cc_btn_icon, this); uint8_t h_ratio = uint8_t(height*100/h_icon);
w_icon = h_ratio*cc_btn_icon_obj->getWidth()/100;
cc_btn_icon_obj->setWidth(w_icon);
}
y_icon = height/2 - cc_btn_icon_obj->getHeight()/2;
cc_btn_icon_obj->setYPos(y_icon);
cc_btn_icon_obj->doPaintBg(false); cc_btn_icon_obj->doPaintBg(false);
} }
} }