Changeset 113 for trunk/Forms

Timestamp:

May 17, 2019, 10:32:20 PM (6 years ago)

Author:

chronos

Message:

• Fixed: SynEdit SelIndex is counter from 1 and not from 0.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (20 diffs)
• UFormMain.pas (modified) (5 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
   Left = 405
-  Height = 586
+  Height = 703
   Top = 226
-  Width = 860
+  Width = 1032
   Caption = 'LazFuck'
-  ClientHeight = 561
-  ClientWidth = 860
-  DesignTimePPI = 120
+  ClientHeight = 669
+  ClientWidth = 1032
+  DesignTimePPI = 144
   Menu = MainMenu1
   OnClose = FormClose
@@ -19 +19 @@
     Left = 0
     Height = 28
-    Top = 533
-    Width = 860
+    Top = 641
+    Width = 1032
     Panels = <    
       item
-        Width = 70
+        Width = 84
       end    
       item
-        Width = 70
+        Width = 84
       end    
       item
-        Width = 80
+        Width = 96
       end>
     ParentFont = False
@@ -36 +36 @@
   object ToolBarMain: TToolBar
     Left = 0
-    Height = 26
+    Height = 31
     Top = 0
-    Width = 860
+    Width = 1032
     Images = Core.ImageListMain
     ParentFont = False
@@ -50 +50 @@
     end
     object ToolButton2: TToolButton
-      Left = 30
+      Left = 36
       Top = 2
       Action = AProjectOpen
@@ -57 +57 @@
     end
     object ToolButton3: TToolButton
-      Left = 74
+      Left = 89
       Top = 2
       Action = AProjectSave
     end
     object ToolButton4: TToolButton
-      Left = 103
+      Left = 124
       Top = 2
       Action = AProjectClose
     end
     object ToolButton5: TToolButton
-      Left = 161
-      Height = 28
+      Left = 194
+      Height = 33
       Top = 2
       Style = tbsSeparator
     end
     object ToolButton6: TToolButton
-      Left = 197
+      Left = 239
       Top = 2
       Action = AProgramRun
     end
     object ToolButton7: TToolButton
-      Left = 168
+      Left = 204
       Top = 2
       Action = AProgramCompile
     end
     object ToolButton8: TToolButton
-      Left = 132
+      Left = 159
       Top = 2
       Action = AOptions
     end
     object ToolButton9: TToolButton
-      Left = 284
+      Left = 344
       Top = 2
       Action = ABreakpointToggle
     end
     object ToolButton10: TToolButton
-      Left = 226
+      Left = 274
       Top = 2
       Action = AProgramPause
     end
     object ToolButton11: TToolButton
-      Left = 255
+      Left = 309
       Top = 2
       Action = AProgramStop
     end
     object ToolButton12: TToolButton
-      Left = 313
+      Left = 379
       Top = 2
       Action = AProgramStepOver
     end
     object ToolButton13: TToolButton
-      Left = 342
+      Left = 414
       Top = 2
       Action = AProgramStepInto
     end
     object ToolButton14: TToolButton
-      Left = 371
+      Left = 449
       Top = 2
       Action = AProgramStepOut
     end
     object ToolButton15: TToolButton
-      Left = 400
+      Left = 484
       Top = 2
       Action = AProgramRunToCursor
     end
     object ToolButtonTarget: TToolButton
-      Left = 429
+      Left = 519
       Hint = 'Target select'
       Top = 2
@@ -132 +132 @@
   end
   object PageControlRight: TPageControl
-    Left = 467
-    Height = 507
-    Top = 26
-    Width = 393
+    Left = 560
+    Height = 610
+    Top = 31
+    Width = 472
     ActivePage = TabSheetDebug
     Align = alRight
@@ -144 +144 @@
     object TabSheetDebug: TTabSheet
       Caption = 'Debug'
-      ClientHeight = 499
-      ClientWidth = 359
+      ClientHeight = 606
+      ClientWidth = 390
       ParentFont = False
       object PanelInput: TPanel
         Left = 0
-        Height = 64
+        Height = 77
         Top = 0
-        Width = 359
+        Width = 390
         Align = alTop
         BevelOuter = bvNone
@@ -160 +160 @@
         Cursor = crVSplit
         Left = 0
-        Height = 5
-        Top = 64
-        Width = 359
+        Height = 6
+        Top = 77
+        Width = 390
         Align = alTop
         ResizeAnchor = akTop
@@ -168 +168 @@
       object PanelOutput: TPanel
         Left = 0
-        Height = 259
-        Top = 69
-        Width = 359
+        Height = 311
+        Top = 83
+        Width = 390
         Align = alTop
         BevelOuter = bvNone
@@ -179 +179 @@
         Cursor = crVSplit
         Left = 0
-        Height = 5
-        Top = 328
-        Width = 359
+        Height = 6
+        Top = 394
+        Width = 390
         Align = alTop
         ResizeAnchor = akTop
@@ -187 +187 @@
       object PanelCPU: TPanel
         Left = 0
-        Height = 86
-        Top = 333
-        Width = 359
+        Height = 103
+        Top = 400
+        Width = 390
         Align = alTop
         BevelOuter = bvNone
@@ -198 +198 @@
         Cursor = crVSplit
         Left = 0
-        Height = 5
-        Top = 419
-        Width = 359
+        Height = 6
+        Top = 503
+        Width = 390
         Align = alTop
         ResizeAnchor = akTop
@@ -206 +206 @@
       object PanelMemory: TPanel
         Left = 0
-        Height = 75
-        Top = 424
-        Width = 359
+        Height = 97
+        Top = 509
+        Width = 390
         Align = alClient
         BevelOuter = bvNone
@@ -217 +217 @@
   end
   object Splitter1: TSplitter
-    Left = 462
-    Height = 507
-    Top = 26
-    Width = 5
+    Left = 554
+    Height = 610
+    Top = 31
+    Width = 6
     Align = alRight
     ResizeAnchor = akRight
@@ -226 +226 @@
   object PanelLeft: TPanel
     Left = 0
-    Height = 507
-    Top = 26
-    Width = 462
+    Height = 610
+    Top = 31
+    Width = 554
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 507
-    ClientWidth = 462
+    ClientHeight = 610
+    ClientWidth = 554
     ParentFont = False
     TabOrder = 4
     object PageControlMain: TPageControl
       Left = 0
-      Height = 384
+      Height = 462
       Top = 0
-      Width = 462
+      Width = 554
       ActivePage = TabSheetSource
       Align = alClient
@@ -256 +256 @@
     object PageControlBottom: TPageControl
       Left = 0
-      Height = 118
-      Top = 389
-      Width = 462
+      Height = 142
+      Top = 468
+      Width = 554
       ActivePage = TabSheetMessages
       Align = alBottom
@@ -273 +273 @@
       Cursor = crVSplit
       Left = 0
-      Height = 5
-      Top = 384
-      Width = 462
+      Height = 6
+      Top = 462
+      Width = 554
       Align = alBottom
       ResizeAnchor = akBottom
@@ -282 +282 @@
   object MainMenu1: TMainMenu
     Images = Core.ImageListMain
-    left = 216
-    top = 136
+    left = 259
+    top = 163
     object MenuItem1: TMenuItem
       Caption = 'Project'
@@ -383 +383 @@
   object ActionList1: TActionList
     Images = Core.ImageListMain
-    left = 216
-    top = 192
+    left = 259
+    top = 230
     object AProjectOpen: TAction
       Category = 'Project'
@@ -529 +529 @@
     DefaultExt = '.b'
     Filter = 'BrainFuck (*.b)|*.b|Any file (*.*)|*.*'
-    left = 56
-    top = 184
+    left = 67
+    top = 221
   end
   object SaveDialog1: TSaveDialog
     DefaultExt = '.b'
     Filter = 'BrainFuck (*.b)|*.b|Any file (*.*)|*.*'
-    left = 56
-    top = 240
+    left = 67
+    top = 288
   end
   object TimerRefresh: TTimer
     OnTimer = TimerRefreshTimer
-    left = 56
-    top = 296
+    left = 67
+    top = 355
   end
   object PopupMenuRecentFiles: TPopupMenu
-    left = 56
-    top = 64
+    left = 67
+    top = 77
   end
   object PopupMenuTargets: TPopupMenu
     Images = Core.ImageListMain
-    left = 56
-    top = 119
+    left = 67
+    top = 143
   end
 end

trunk/Forms/UFormMain.pas

@@ -418 +418 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.SynEditTarget.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(FormTargetCode.SynEditTarget.SelStart - 1);
   if Assigned(DebugStep) then begin
-    FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition;
+    FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
     PageControlMain.TabIndex := 0;
   end;
@@ -429 +429 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
   if Assigned(DebugStep) then begin
-    FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition;
+    FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
     PageControlMain.TabIndex := 1;
   end;
@@ -521 +521 @@
   BreakPoint: TBreakPoint;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
   if Assigned(DebugStep) then begin
     BreakPoint := Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.TargetPosition);
@@ -554 +554 @@
   if Core.CurrentTarget.State = rsStopped then begin
     if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart);
+    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
     Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.TargetPosition);
     AProgramRun.Execute;
   end else begin
-    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart);
+    DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
     Core.CurrentTarget.RunToCursor(DebugStep.TargetPosition);
   end;
@@ -568 +568 @@
 begin
   DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(Core.CurrentTarget.ExecutionPosition);
-  FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition;
-  FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition;
+  FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
+  FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
   if PageControlMain.TabIndex = 0 then FormSourceCode.SynEditSource.SetFocus;
   if PageControlMain.TabIndex = 1 then FormTargetCode.SynEditTarget.SetFocus;