Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-11 12:54:15 +02:00
Code Activity

Better word wrapping for hoverwatch

Browse source
This commit is contained in:
Brian Fiete 2021-02-02 14:58:01 -08:00
parent 9afa24e5d7
commit 76d997fca7
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BeefLibs/Beefy2D/src/gfx/Font.bf
View file

@ -887,7 +887,7 @@ namespace Beefy.gfx
if (fontMetrics != null) if (fontMetrics != null)
fontMetrics.mLineCount++; fontMetrics.mLineCount++;
drawHeight += Draw(g, StringView(workingStr, 0, checkIdx), useX, useY, justification, width, stringEndMode, fontMetrics); drawHeight += Draw(g, StringView(workingStr, 0, checkIdx), useX, useY, justification, width, .Truncate, fontMetrics);
useY += GetLineSpacing(); useY += GetLineSpacing();
workingStr.Adjust(checkIdx); workingStr.Adjust(checkIdx);
} }

5
IDE/src/ui/HoverWatch.bf
View file

@ -1257,6 +1257,8 @@ namespace IDE.ui
if ((wantWordWrap) && (useWidth < wantWidth)) if ((wantWordWrap) && (useWidth < wantWidth))
{ {
float actualMaxWidth = 0;
for (WatchListViewItem listViewItem in listView.GetRoot().mChildItems) for (WatchListViewItem listViewItem in listView.GetRoot().mChildItems)
{ {
if (listViewItem.mLabel == null) if (listViewItem.mLabel == null)
@ -1265,11 +1267,14 @@ namespace IDE.ui
listView.mWordWrap = true; listView.mWordWrap = true;
FontMetrics fontMetrics = .(); FontMetrics fontMetrics = .();
float nameHeight = font.Draw(null, listViewItem.mLabel, 0, 0, -1, useWidth - GS!(32), FontOverflowMode.Wrap, &fontMetrics); float nameHeight = font.Draw(null, listViewItem.mLabel, 0, 0, -1, useWidth - GS!(32), FontOverflowMode.Wrap, &fontMetrics);
actualMaxWidth = Math.Max(actualMaxWidth, fontMetrics.mMaxWidth);
float addHeight = nameHeight - listViewItem.mSelfHeight; float addHeight = nameHeight - listViewItem.mSelfHeight;
height += addHeight; height += addHeight;
} }
useWidth = actualMaxWidth + GS!(32);
listView.mColumns[0].mWidth = useWidth - GS!(2); listView.mColumns[0].mWidth = useWidth - GS!(2);
} }