dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASM window now scrolls to approximately the correct place for current line.

Browse source
This commit is contained in:
EdwardNutting_cp 2014-01-11 17:48:29 +00:00
parent c7a239f1c3
commit 45f3002493
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source2/VSIP/Cosmos.VS.Windows/AssemblyUC.xaml
View file

@ -30,7 +30,7 @@
</Button>--> </Button>-->
<Rectangle Width="8" /> <Rectangle Width="8" />
</ToolBar> </ToolBar>
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"> <ScrollViewer Name="ASMScrollViewer" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<TextBlock Name="tblkSource"> <TextBlock Name="tblkSource">
<TextBlock.ContextMenu> <TextBlock.ContextMenu>
<ContextMenu> <ContextMenu>

14
source2/VSIP/Cosmos.VS.Windows/AssemblyUC.xaml.cs
View file

@ -129,6 +129,7 @@ namespace Cosmos.VS.Windows
List<string> xLabelPrefixes = new List<string>(); List<string> xLabelPrefixes = new List<string>();
bool foundMETHOD_Prefix = false; bool foundMETHOD_Prefix = false;
bool foundMethodName = false; bool foundMethodName = false;
int mCurrentLineNumber = 0;
foreach (var xLine in mLines) foreach (var xLine in mLines)
{ {
string xDisplayLine = xLine.ToString(); string xDisplayLine = xLine.ToString();
@ -186,6 +187,11 @@ namespace Cosmos.VS.Windows
if (tblkSource.Inlines.Count > 0) if (tblkSource.Inlines.Count > 0)
{ {
tblkSource.Inlines.Add(new LineBreak()); tblkSource.Inlines.Add(new LineBreak());
if (!foundCurrentLine)
{
mCurrentLineNumber++;
}
mCode.AppendLine(); mCode.AppendLine();
} }
} }
@ -257,11 +263,19 @@ namespace Cosmos.VS.Windows
xRun.Foreground = Brushes.HotPink; xRun.Foreground = Brushes.HotPink;
} }
if (!foundCurrentLine)
{
mCurrentLineNumber++;
}
tblkSource.Inlines.Add(xRun); tblkSource.Inlines.Add(xRun);
tblkSource.Inlines.Add(new LineBreak()); tblkSource.Inlines.Add(new LineBreak());
mCode.AppendLine(xDisplayLine); mCode.AppendLine(xDisplayLine);
} }
//EdMan196: This line of code was worked out by trial and error.
//If you change it proper testing/thinking, you will have to add RIP to your name.
double offset = mCurrentLineNumber * ((tblkSource.FontSize * tblkSource.FontFamily.LineSpacing) - 2.1);
ASMScrollViewer.ScrollToVerticalOffset(offset);
} }
protected void OnASMCodeTextMouseUp(object aSender, System.Windows.Input.MouseButtonEventArgs aArgs) protected void OnASMCodeTextMouseUp(object aSender, System.Windows.Input.MouseButtonEventArgs aArgs)