Skip to content

break point alignmet #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wc4ever wants to merge 3 commits into
base: master
Choose a base branch
from
Open

break point alignmet #1993

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
181dd34
fix breakpoints alignment
Wc4ever Jun 22, 2024
e3ede1e
fix line pointer alignment
Wc4ever Jun 22, 2024
e90d6bc
Merge branch 'beefytech:master' into dev/breakpoint_alignment
Wc4ever Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 8 additions & 24 deletions IDE/src/ui/SourceViewPanel.bf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4508,7 +4508,7 @@ namespace IDE.ui
Boomkmark = 0x80
}

static float sDrawLeftAdjust = GS!(12);
static float sIconRightIndent = GS!(4);

public override void Draw(Graphics g)
{
Expand Down Expand Up @@ -4655,7 +4655,7 @@ namespace IDE.ui
int breakpointCount = (.)(curLineFlags & .BreakpointCountMask);
curLineFlags++;

float iconX = Math.Max(GS!(-2), mEditWidget.mX - GS!(24) - sDrawLeftAdjust) + breakpointCount*-GS!(2);
float iconX = sIconRightIndent;
float iconY = 0 + ewc.mLineCoords[drawLineNum] + (lineSpacing - DarkTheme.sUnitSize + GS!(5)) / 2;

// Just leave last digit visible
Expand All @@ -4680,8 +4680,7 @@ namespace IDE.ui
continue;
//hadLineIcon[drawLineNum - lineStart] = true;
Image image = DarkTheme.sDarkTheme.GetImage(bookmark.mIsDisabled ? .IconBookmarkDisabled : .IconBookmark);
g.Draw(image, Math.Max(GS!(-5), mEditWidget.mX - GS!(30) - sDrawLeftAdjust),
0 + bookmark.mLineNum * lineSpacing);
g.Draw(image, 0, 0 + bookmark.mLineNum * lineSpacing);

var curLineFlags = ref lineFlags[drawLineNum - lineStart];
curLineFlags |= .Boomkmark;
Expand Down Expand Up @@ -4718,22 +4717,8 @@ namespace IDE.ui
continue;

lineStr.Clear();
lineStr.AppendF("{0}", lineIdx + 1);

int maxLineChars = Int32.MaxValue;

let curLineFlags = lineFlags[lineIdx - lineStart];
if ((uint8)(curLineFlags & .BreakpointCountMask) > 0)
maxLineChars = 1;
else if (curLineFlags.HasFlag(.Boomkmark))
maxLineChars = 2;

switch (maxLineChars)
{
case 0:
case 1: lineStr.AppendF("{0}", (lineIdx + 1) % 10);
case 2: lineStr.AppendF("{0}", (lineIdx + 1) % 100);
default: lineStr.AppendF("{0}", lineIdx + 1);
}
g.DrawString(lineStr, 0, GS!(2) + ewc.mLineCoords[lineIdx], FontAlign.Right, editX - GS!(14));
}
}
Expand Down Expand Up @@ -4844,7 +4829,7 @@ namespace IDE.ui
{
mLinePointerDrawData.mUpdateCnt = gApp.mUpdateCnt;
mLinePointerDrawData.mDebuggerContinueIdx = gApp.mDebuggerContinueIdx;
g.Draw(img, mEditWidget.mX - GS!(20) - sDrawLeftAdjust,
g.Draw(img, sIconRightIndent + sIconRightIndent,
0 + ewc.GetLineY(lineNum, 0));
}

Expand All @@ -4854,7 +4839,7 @@ namespace IDE.ui
if (dragLineNum >= 0 && dragLineNum != lineNum)
{
using (g.PushColor(0x7FFFFFFF))
g.Draw(img, mEditWidget.mX - GS!(20) - sDrawLeftAdjust,
g.Draw(img, sIconRightIndent + sIconRightIndent,
0 + ewc.GetLineY(dragLineNum, 0));
}
}
Expand Down Expand Up @@ -7210,7 +7195,7 @@ namespace IDE.ui

var font = IDEApp.sApp.mTinyCodeFont;

float lineWidth = Math.Max(font.GetWidth(ToStackString!(mEditWidget.Content.GetLineCount())) + GS!(24), GS!(32));
float lineWidth = Math.Max(font.GetWidth(ToStackString!(mEditWidget.Content.GetLineCount())) + GS!(24) + GS!(14), GS!(32));
return Math.Max(GS!(24), lineWidth);
}

Expand Down Expand Up @@ -7514,8 +7499,7 @@ namespace IDE.ui
if (!mIsDraggingLinePointer && IDEApp.sApp.mExecutionPaused && gApp.mDebugger.mActiveCallStackIdx == 0 && mMouseFlags.HasFlag(.Left))
{
SourceEditWidgetContent ewc = (.)mEditWidget.Content;
Rect linePointerRect = .(
mEditWidget.mX - GS!(20) - sDrawLeftAdjust,
Rect linePointerRect = .(sIconRightIndent + sIconRightIndent,
0 + ewc.GetLineY(mLinePointerDrawData.mLine, 0),
GS!(15),
GS!(15)
Expand Down