i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BMenuField/BTextControl: Store and reuse Label()

Browse Source
This commit is contained in:
John Scipione
2014-04-24 15:31:16 -04:00
parent b11edca47d
commit 60370b9a6c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuField.cpp
+3 -2
View File
@@ -1288,8 +1288,9 @@ BMenuField::_ValidateLayoutData()
font_height& fh = fLayoutData->font_info; font_height& fh = fLayoutData->font_info;
GetFontHeight(&fh); GetFontHeight(&fh);
if (Label() != NULL) { const char* label = Label();
fLayoutData->label_width = ceilf(StringWidth(Label())); if (label != NULL) {
fLayoutData->label_width = ceilf(StringWidth(label));
fLayoutData->label_height = ceilf(fh.ascent) + ceilf(fh.descent); fLayoutData->label_height = ceilf(fh.ascent) + ceilf(fh.descent);
} else { } else {
fLayoutData->label_width = 0; fLayoutData->label_width = 0;
src/kits/interface/TextControl.cpp
+3 -2
View File
@@ -1259,8 +1259,9 @@ BTextControl::_ValidateLayoutData()
font_height& fh = fLayoutData->font_info; font_height& fh = fLayoutData->font_info;
GetFontHeight(&fh); GetFontHeight(&fh);
if (Label() != NULL) { const char* label = Label();
fLayoutData->label_width = ceilf(StringWidth(Label())); if (label != NULL) {
fLayoutData->label_width = ceilf(StringWidth(label));
fLayoutData->label_height = ceilf(fh.ascent) + ceilf(fh.descent); fLayoutData->label_height = ceilf(fh.ascent) + ceilf(fh.descent);
} else { } else {
fLayoutData->label_width = 0; fLayoutData->label_width = 0;