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

CComponentsButton: fix height comparsion

Browse Source 
comparsion with itself


Origin commit data
------------------
Commit: 4a03eb6980
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
This commit is contained in:
Thilo Graf
2017-01-05 10:22:49 +01:00
parent eb7d16a32a
commit 18b9d54586
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,7 +215,7 @@ void CComponentsButton::initCaption()
* Otherwise definied font will be used. Button dimensions are calculated from parent container (e.g. footer...). * Otherwise definied font will be used. Button dimensions are calculated from parent container (e.g. footer...).
* These dimensions must be enough to display complete content like possible icon and without truncated text. * These dimensions must be enough to display complete content like possible icon and without truncated text.
*/ */
if ((cc_btn_font->getHeight()- 2*w_frame) > h_cap && (cc_btn_font->getRenderWidth(cc_btn_text)- 2*w_frame) > w_cap) if ((cc_btn_font->getHeight()- 2*w_frame) > (height - 2*w_frame) && (cc_btn_font->getRenderWidth(cc_btn_text)- 2*w_frame) > w_cap)
cc_btn_font = def_font; cc_btn_font = def_font;
cc_btn_text_obj->setText(cc_btn_text, CTextBox::NO_AUTO_LINEBREAK, cc_btn_font); cc_btn_text_obj->setText(cc_btn_text, CTextBox::NO_AUTO_LINEBREAK, cc_btn_font);