diff --git a/SourceGen/SGTestData/20090-notes-and-comments.dis65 b/SourceGen/SGTestData/20090-notes-and-comments.dis65 index a095acfd..034a2131 100644 --- a/SourceGen/SGTestData/20090-notes-and-comments.dis65 +++ b/SourceGen/SGTestData/20090-notes-and-comments.dis65 @@ -167,7 +167,7 @@ "BackgroundColor":0}, "115":{ -"Text":"[BOX]ALL CAPS [URL=HTTPS://EXAMPLE.COM/]FOR EVERYTHING[/URL][HR][/BOX]\r\n[BR]\r\n[WIDTH=10]SHORT LINES\r\n[BOX CHAR=\u0027X\u0027]BOXED[/BOX]\r\n", +"Text":"[BOX]ALL CAPS [URL=HTTPS://EXAMPLE.COM/]FOR EVERYTHING[/URL][HR][/BOX]\r\n[BR]\r\n[WIDTH=10]SHORT LINES\r\n[BOX CHAR=\u0027X\u0027]BOXED[HR CHAR=\u0027-\u0027]STUFF[/BOX]\r\n", "IsFancy":true, "BoxMode":false, "MaxWidth":80, diff --git a/SourceGen/SGTestData/Expected/20090-notes-and-comments_64tass.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_64tass.S index 83ab9fcd..3b9f63a7 100644 --- a/SourceGen/SGTestData/Expected/20090-notes-and-comments_64tass.S +++ b/SourceGen/SGTestData/Expected/20090-notes-and-comments_64tass.S @@ -170,6 +170,8 @@ L1062 bit plataddr ;Pull in plataddr to see the comment on the platform ;LINES ;XXXXXXXXX ;X BOXED X +;X-------X +;X STUFF X ;XXXXXXXXX lda #$17 ;Test some folding diff --git a/SourceGen/SGTestData/Expected/20090-notes-and-comments_acme.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_acme.S index f74647d6..7834265f 100644 --- a/SourceGen/SGTestData/Expected/20090-notes-and-comments_acme.S +++ b/SourceGen/SGTestData/Expected/20090-notes-and-comments_acme.S @@ -168,6 +168,8 @@ L1062 bit plataddr ;Pull in plataddr to see the comment on the platform ;LINES ;XXXXXXXXX ;X BOXED X +;X-------X +;X STUFF X ;XXXXXXXXX lda #$17 ;Test some folding diff --git a/SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.S index 2dd8de26..358ac337 100644 --- a/SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.S +++ b/SourceGen/SGTestData/Expected/20090-notes-and-comments_cc65.S @@ -170,6 +170,8 @@ L1062: bit plataddr ;Pull in plataddr to see the comment on the platform ;LINES ;XXXXXXXXX ;X BOXED X +;X-------X +;X STUFF X ;XXXXXXXXX lda #$17 ;Test some folding diff --git a/SourceGen/SGTestData/Expected/20090-notes-and-comments_merlin32.S b/SourceGen/SGTestData/Expected/20090-notes-and-comments_merlin32.S index 32bbd0e8..06217a33 100644 --- a/SourceGen/SGTestData/Expected/20090-notes-and-comments_merlin32.S +++ b/SourceGen/SGTestData/Expected/20090-notes-and-comments_merlin32.S @@ -165,6 +165,8 @@ L1062 bit plataddr ;Pull in plataddr to see the comment on the platform f *LINES *XXXXXXXXX *X BOXED X +*X-------X +*X STUFF X *XXXXXXXXX lda #$17 *Test some folding diff --git a/SourceGen/Tools/WpfGui/ShowText.xaml.cs b/SourceGen/Tools/WpfGui/ShowText.xaml.cs index 2472d992..2c32d020 100644 --- a/SourceGen/Tools/WpfGui/ShowText.xaml.cs +++ b/SourceGen/Tools/WpfGui/ShowText.xaml.cs @@ -66,6 +66,7 @@ public ShowText(Window owner, string initialText) { private void Window_KeyEventHandler(object sender, KeyEventArgs e) { if (e.Key == Key.Escape) { Close(); + e.Handled = true; } } } diff --git a/SourceGen/WpfGui/EditLongComment.xaml b/SourceGen/WpfGui/EditLongComment.xaml index 8c7543cb..d8286183 100644 --- a/SourceGen/WpfGui/EditLongComment.xaml +++ b/SourceGen/WpfGui/EditLongComment.xaml @@ -82,9 +82,10 @@ limitations under the License. FontFamily="{StaticResource GeneralMonoFont}" VerticalScrollBarVisibility="Visible" IsReadOnly="True" Background="#f8f8f8"/> - -