Commit `57592af`

Nick committed on Oct 11, 2020

Fix row numbering for different font sizes

commit 57592afb39590379852e223755b7d0bde7502e50 parent bc8007e

2 changed files +43−41

Modifiedtracker.lfm +40−39

 object frmTracker: TfrmTracker
-  Left = 697
+  Left = 1941
   Height = 643
-  Top = 216
+  Top = 294
   Width = 1269
   AllowDropFiles = True
   Caption = 'hUGETracker'
       Height = 511
       Top = 0
       Width = 1071
-      ActivePage = RoutinesTabSheet
+      ActivePage = PatternTabSheet
       Align = alClient
       ParentFont = False
-      TabIndex = 5
+      TabIndex = 1
       TabOrder = 0
       object GeneralTabSheet: TTabSheet
         Caption = 'General'
-        ClientHeight = 646
+        ClientHeight = 483
-        ClientWidth = 1064
+        ClientWidth = 1063
         ParentFont = False
         object SongInformationGroupbox: TGroupBox
           Left = 8
       end
       object PatternTabSheet: TTabSheet
         Caption = 'Patterns'
-        ClientHeight = 646
+        ClientHeight = 483
-        ClientWidth = 1064
+        ClientWidth = 1063
         ParentFont = False
         object Panel3: TPanel
           Left = 224
-          Height = 646
+          Height = 483
           Top = 0
-          Width = 840
+          Width = 839
           Align = alClient
-          ClientHeight = 646
+          ClientHeight = 483
-          ClientWidth = 840
+          ClientWidth = 839
           ParentFont = False
           TabOrder = 0
           object HeaderControl1: THeaderControl
             Height = 30
             Hint = 'Left click to mute, right click to solo'
             Top = 1
-            Width = 838
+            Width = 837
             DragReorder = False
             Images = ImageList2
             Sections = <
           end
           object ScrollBox1: TScrollBox
             Left = 1
-            Height = 614
+            Height = 451
             Top = 31
-            Width = 838
+            Width = 837
-            HorzScrollBar.Increment = 5
+            HorzScrollBar.Increment = 3
-            HorzScrollBar.Page = 56
+            HorzScrollBar.Page = 32
             HorzScrollBar.Smooth = True
             HorzScrollBar.Tracking = True
-            VertScrollBar.Page = 88
+            VertScrollBar.Increment = 5
+            VertScrollBar.Page = 50
             VertScrollBar.Smooth = True
             VertScrollBar.Tracking = True
             Align = alClient
             BorderStyle = bsNone
-            ClientHeight = 614
+            ClientHeight = 451
-            ClientWidth = 838
+            ClientWidth = 837
             ParentFont = False
             TabOrder = 1
             OnMouseWheelDown = ScrollBox1MouseWheelDown
             OnMouseWheelUp = ScrollBox1MouseWheelUp
             object RowNumberStringGrid: TStringGrid
               Left = 0
-              Height = 614
+              Height = 451
               Top = 0
               Width = 32
               Align = alLeft
         end
         object OrderEditStringGrid: TStringGrid
           Left = 0
-          Height = 646
+          Height = 483
           Top = 0
           Width = 224
           Align = alLeft
       ParentShowHint = False
     end
     object PanicToolButton: TToolButton
-      Left = 551
+      Left = 557
       Hint = 'Stops all sound output'
       Top = 0
       AutoSize = True
       ShowHint = True
     end
     object ToolButton2: TToolButton
-      Left = 145
+      Left = 147
       Top = 0
       Action = PlayCursorAction
     end
     object ToolButton4: TToolButton
-      Left = 219
+      Left = 221
       Top = 0
       Action = StopAction
     end
     object ExportGBButton: TToolButton
-      Left = 287
+      Left = 291
       Hint = 'Export the song as a standalone ROM'
       Top = 0
       AutoSize = True
       Style = tbsDivider
     end
     object ToolButton6: TToolButton
-      Left = 284
+      Left = 286
       Height = 22
       Top = 0
       Caption = 'ToolButton6'
       Style = tbsDivider
     end
     object ToolButton7: TToolButton
-      Left = 1088
+      Left = 1097
       Height = 22
       Top = 0
       Caption = 'ToolButton7'
       Style = tbsSeparator
     end
     object OctaveSpinEdit: TSpinEdit
-      Left = 654
+      Left = 663
       Height = 23
       Hint = 'The octave offset for entering new notes'
       Top = 0
       TabOrder = 0
     end
     object ToolButton9: TToolButton
-      Left = 606
+      Left = 612
       Height = 22
       Top = 0
       Caption = 'ToolButton9'
       Style = tbsSeparator
     end
     object Label22: TLabel
-      Left = 611
+      Left = 620
       Height = 22
       Top = 0
       Width = 43
       ParentFont = False
     end
     object Label23: TLabel
-      Left = 719
+      Left = 728
       Height = 22
       Top = 0
       Width = 70
       ParentFont = False
     end
     object InstrumentComboBox: TComboBox
-      Left = 789
+      Left = 798
       Height = 23
       Hint = 'The selected instrument for new notes'
       Top = 0
       Text = '(no instrument)'
     end
     object Label24: TLabel
-      Left = 1003
+      Left = 1012
       Height = 22
       Top = 0
       Width = 35
       ParentFont = False
     end
     object StepSpinEdit: TSpinEdit
-      Left = 1038
+      Left = 1047
       Height = 23
       Hint = 'How many rows to step down after entering a new note'
       Top = 0
       TabOrder = 2
     end
     object ToolButton3: TToolButton
-      Left = 82
+      Left = 84
       Top = 0
       Action = PlayStartAction
     end
     object ExportGBSButton: TToolButton
-      Left = 368
+      Left = 372
       Hint = 'Export the song as a GBS soundtrack'
       Top = 0
       Caption = 'Export .GBS'
       OnClick = ExportGBSButtonClick
     end
     object ToolButton5: TToolButton
-      Left = 548
+      Left = 552
       Height = 22
       Top = 0
       Caption = 'ToolButton5'
       Style = tbsDivider
     end
     object ToolButton10: TToolButton
-      Left = 455
+      Left = 459
       Hint = 'Export the song as WAV or MP3'
       Top = 0
       Caption = 'Render Song'

Modifiedtracker.pas +3−2

   TrackerGrid.OnResize:=@OnTrackerGridResize;
   TrackerGrid.OnCursorOutOfBounds:=@OnTrackerGridCursorOutOfBounds;
   TrackerGrid.Left := RowNumberStringGrid.Left + RowNumberStringGrid.Width;
-  RowNumberStringGrid.DefaultRowHeight := TrackerGrid.RowHeight;
   TrackerGrid.FontSize := TrackerSettings.PatternEditorFontSize;
+  RowNumberStringGrid.DefaultRowHeight := TrackerGrid.RowHeight;
   ScopesOn := TrackerSettings.UseScopes;
   // Fix the size of the channel headers
   frmOptions.ShowModal;
   TrackerGrid.FontSize := TrackerSettings.PatternEditorFontSize;
+  RowNumberStringGrid.DefaultRowHeight := TrackerGrid.RowHeight;
   ScopesOn := TrackerSettings.UseScopes;
   OscilloscopeUpdateTimer.Enabled := ScopesOn;

Commit 57592af

Commit `57592af`