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

I accidentally removed some backwards compatible behavior. When there is no

Browse Source 
label, a TextControl maintains it's current width in ResizeToPreferred() if
it is wide enough. Should fix #2751.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27646 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-09-20 10:46:09 +00:00
parent c7d112ff6a
commit 1aaf53ecac
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TextControl.cpp
+9 -2
View File
@@ -467,8 +467,15 @@ BTextControl::GetPreferredSize(float *_width, float *_height)
_ValidateLayoutData(); _ValidateLayoutData();
if (_width) if (_width) {
*_width = fLayoutData->min.width; float minWidth = fLayoutData->min.width;
if (Label() == NULL && !(Flags() & B_SUPPORTS_LAYOUT)) {
// Indeed, only if there is no label! BeOS backwards compatible
// behavior:
minWidth = max_c(minWidth, Bounds().Width());
}
*_width = minWidth;
}
if (_height) if (_height)
*_height = fLayoutData->min.height; *_height = fLayoutData->min.height;