Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 14:24:10 +02:00
Code Activity

Fixed spacing for line numbers

Browse source
This commit is contained in:
Brian Fiete 2022-03-03 11:18:15 -08:00
parent db8a1b6367
commit b1a772e652
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
IDE/src/ui/DisassemblyPanel.bf
View file

@ -179,6 +179,7 @@ namespace IDE.ui
int32 mHotIdx; int32 mHotIdx;
int32 mDefLineStart; int32 mDefLineStart;
int32 mDefLineEnd; int32 mDefLineEnd;
float mLeftSize = GS!(30);
bool mIsRawDiassembly; bool mIsRawDiassembly;
public String mSourceFileName ~ delete _; public String mSourceFileName ~ delete _;
public String mAliasFilePath ~ delete _; public String mAliasFilePath ~ delete _;
@ -537,6 +538,8 @@ namespace IDE.ui
String sourceLineText = scope .(1024); String sourceLineText = scope .(1024);
int32 maxLine = 0;
for (var lineStrView in codeData.Split('\n')) for (var lineStrView in codeData.Split('\n'))
{ {
checkIdx++; checkIdx++;
@ -691,6 +694,8 @@ namespace IDE.ui
lineIdx++; lineIdx++;
mLineDatas.Add(lineData); mLineDatas.Add(lineData);
maxLine = Math.Max(maxLine, sourceLineNum + 1);
} }
// Just about the only case we allow an empty line is when it occurs after a non-empty source line // Just about the only case we allow an empty line is when it occurs after a non-empty source line
@ -776,6 +781,13 @@ namespace IDE.ui
} }
} }
float leftSize = IDEApp.sApp.mTinyCodeFont.GetWidth(scope $"{maxLine}") + GS!(12);
if (leftSize != mLeftSize)
{
mLeftSize = leftSize;
ResizeComponents();
}
mEditWidget.Content.ClampCursor(); mEditWidget.Content.ClampCursor();
mEditWidget.Content.ContentChanged(); mEditWidget.Content.ContentChanged();
mEditWidget.Content.RecalcSize(); mEditWidget.Content.RecalcSize();
@ -874,7 +886,7 @@ namespace IDE.ui
{ {
var lineData = mLineDatas[lineIdx]; var lineData = mLineDatas[lineIdx];
if (lineData.mSourceFile != null) if (lineData.mSourceFile != null)
g.DrawString(StackStringFormat!("{0}", lineData.mSourceLineNum + 1), GS!(8), GS!(2) + lineIdx * lineSpacing, FontAlign.Right, GS!(18)); g.DrawString(StackStringFormat!("{0}", lineData.mSourceLineNum + 1), GS!(8), GS!(2) + lineIdx * lineSpacing, FontAlign.Right, mEditWidget.mX - GS!(14));
} }
} }
@ -1139,13 +1151,13 @@ namespace IDE.ui
{ {
base.ResizeComponents(); base.ResizeComponents();
if (mPanelHeader != null) if (mPanelHeader != null)
mPanelHeader.Resize(GS!(30), 0, Math.Max(mWidth - GS!(30), 0), GS!(32)); mPanelHeader.Resize(mLeftSize, 0, Math.Max(mWidth - mLeftSize, 0), GS!(32));
var font = DarkTheme.sDarkTheme.mSmallFont; var font = DarkTheme.sDarkTheme.mSmallFont;
if (mStayInDisassemblyCheckbox != null) if (mStayInDisassemblyCheckbox != null)
mStayInDisassemblyCheckbox.Resize(font.GetWidth(mPanelHeader.mLabel) + GS!(30), GS!(6), mStayInDisassemblyCheckbox.CalcWidth(), GS!(20)); mStayInDisassemblyCheckbox.Resize(font.GetWidth(mPanelHeader.mLabel) + GS!(30), GS!(6), mStayInDisassemblyCheckbox.CalcWidth(), GS!(20));
mEditWidget.Resize(GS!(30), GS!(32), Math.Max(mWidth - GS!(30), 0), Math.Max(mHeight - GS!(32), 0)); mEditWidget.Resize(mLeftSize, GS!(32), Math.Max(mWidth - mLeftSize, 0), Math.Max(mHeight - GS!(32), 0));
} }
public override void Resize(float x, float y, float width, float height) public override void Resize(float x, float y, float width, float height)