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

* Only use the new preferred computation method if word wrap is disabled, or

Browse Source 
else this won't work as is (this is something that could be done, better,
  though).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32077 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-08-03 14:41:27 +00:00
parent 56c6c0fefb
commit 360495a3bf
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TextView.cpp
+5
View File
@@ -2799,6 +2799,10 @@ BTextView::_ValidateLayoutData()
// compute our preferred size // compute our preferred size
fLayoutData->preferred.height = fTextRect.Height() fLayoutData->preferred.height = fTextRect.Height()
+ fLayoutData->topInset + fLayoutData->bottomInset; + fLayoutData->topInset + fLayoutData->bottomInset;
if (fWrap)
fLayoutData->preferred.width = min.width + 5 * lineHeight;
else {
float maxWidth = 0; float maxWidth = 0;
for (int i = 0; i < fLines->NumLines(); i++) { for (int i = 0; i < fLines->NumLines(); i++) {
float width = LineWidth(0); float width = LineWidth(0);
@@ -2810,6 +2814,7 @@ BTextView::_ValidateLayoutData()
fLayoutData->preferred.width fLayoutData->preferred.width
= maxWidth + fLayoutData->leftInset + fLayoutData->rightInset; = maxWidth + fLayoutData->leftInset + fLayoutData->rightInset;
}
fLayoutData->valid = true; fLayoutData->valid = true;