Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BTextView: implemented height-for-width when read-only. 

* This is not an ideal implementation, as it actually relayouts
  the text view. IOW it's actually wrong, but it does seem to
  work without any issues.
This commit is contained in:
Axel Dörfler 2015-07-30 18:33:24 +02:00
parent fd3e3e7bfb
commit e27a53b231
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/kits/interface/TextView.cpp
View File

@ -2577,9 +2577,11 @@ BTextView::PreferredSize()
bool
BTextView::HasHeightForWidth()
{
// ToDo: When not editable and not embedded in a scroll view, we should
// assume that all text is supposed to be visible.
return BView::HasHeightForWidth();
if (IsEditable())
return BView::HasHeightForWidth();
// When not editable, we assume that all text is supposed to be visible.
return true;
}
@ -2587,8 +2589,21 @@ void
BTextView::GetHeightForWidth(float width, float* min, float* max,
float* preferred)
{
// ToDo: See above and implement.
BView::GetHeightForWidth(width, min, max, preferred);
if (IsEditable()) {
BView::GetHeightForWidth(width, min, max, preferred);
return;
}
// TODO: don't change the actual text rect!
fTextRect.right = fTextRect.left + width;
_Refresh(0, TextLength(), false);
if (min != NULL)
*min = fTextRect.Height();
if (max != NULL)
*max = fTextRect.Height();
if (preferred != NULL)
*preferred = fTextRect.Height();
}