Commit f3e63d2

Nick committed on
Fix for header size hack
commit f3e63d221b3f20d64e989eb15fa345205519374c parent 1cece42
2 changed files +53−25
Modifiedtracker.lfm +37−19
@@ -1,7 +1,7 @@
1 object frmTracker: TfrmTracker 1 object frmTracker: TfrmTracker
2 Left = 796 2 Left = 825
3 Height = 1250 3 Height = 1250
4 Top = 758 4 Top = 233
5 Width = 2067 5 Width = 2067
6 Caption = 'hUGETracker' 6 Caption = 'hUGETracker'
7 ClientHeight = 1216 7 ClientHeight = 1216
@@ -14,6 +14,7 @@ object frmTracker: TfrmTracker
14 OnKeyDown = FormKeyDown 14 OnKeyDown = FormKeyDown
15 OnKeyUp = FormKeyUp 15 OnKeyUp = FormKeyUp
16 OnShow = FormShow 16 OnShow = FormShow
17 Position = poDefault
17 ShowHint = True 18 ShowHint = True
18 LCLVersion = '2.0.6.0' 19 LCLVersion = '2.0.6.0'
19 object TreeView1: TTreeView 20 object TreeView1: TTreeView
@@ -1697,7 +1698,7 @@ object frmTracker: TfrmTracker
1697 ParentShowHint = False 1698 ParentShowHint = False
1698 end 1699 end
1699 object PanicToolButton: TToolButton 1700 object PanicToolButton: TToolButton
1700 Left = 547 1701 Left = 694
1701 Hint = 'Stops all sound output' 1702 Hint = 'Stops all sound output'
1702 Top = 0 1703 Top = 0
1703 AutoSize = True 1704 AutoSize = True
@@ -1708,21 +1709,21 @@ object frmTracker: TfrmTracker
1708 ShowHint = True 1709 ShowHint = True
1709 end 1710 end
1710 object ToolButton2: TToolButton 1711 object ToolButton2: TToolButton
1711 Left = 169 1712 Left = 217
1712 Top = 0 1713 Top = 0
1713 Caption = '⏯' 1714 Caption = '▶️ Cursor'
1714 ImageIndex = 75 1715 ImageIndex = 75
1715 OnClick = ToolButton2Click 1716 OnClick = ToolButton2Click
1716 end 1717 end
1717 object ToolButton4: TToolButton 1718 object ToolButton4: TToolButton
1718 Left = 224 1719 Left = 327
1719 Top = 0 1720 Top = 0
1720 Caption = '⏹️' 1721 Caption = '⏹ Stop'
1721 ImageIndex = 73 1722 ImageIndex = 73
1722 OnClick = ToolButton4Click 1723 OnClick = ToolButton4Click
1723 end 1724 end
1724 object ExportGBButton: TToolButton 1725 object ExportGBButton: TToolButton
1725 Left = 284 1726 Left = 434
1726 Top = 0 1727 Top = 0
1727 AutoSize = True 1728 AutoSize = True
1728 Caption = 'Export .GB' 1729 Caption = 'Export .GB'
@@ -1737,21 +1738,21 @@ object frmTracker: TfrmTracker
1737 Style = tbsDivider 1738 Style = tbsDivider
1738 end 1739 end
1739 object ToolButton6: TToolButton 1740 object ToolButton6: TToolButton
1740 Left = 279 1741 Left = 429
1741 Height = 39 1742 Height = 39
1742 Top = 0 1743 Top = 0
1743 Caption = 'ToolButton6' 1744 Caption = 'ToolButton6'
1744 Style = tbsDivider 1745 Style = tbsDivider
1745 end 1746 end
1746 object ToolButton7: TToolButton 1747 object ToolButton7: TToolButton
1747 Left = 539 1748 Left = 1664
1748 Height = 39 1749 Height = 39
1749 Top = 0 1750 Top = 0
1750 Caption = 'ToolButton7' 1751 Caption = 'ToolButton7'
1751 Style = tbsSeparator 1752 Style = tbsSeparator
1752 end 1753 end
1753 object OctaveSpinEdit: TSpinEdit 1754 object OctaveSpinEdit: TSpinEdit
1754 Left = 708 1755 Left = 855
1755 Height = 38 1756 Height = 38
1756 Top = 0 1757 Top = 0
1757 Width = 158 1758 Width = 158
@@ -1761,14 +1762,14 @@ object frmTracker: TfrmTracker
1761 TabOrder = 0 1762 TabOrder = 0
1762 end 1763 end
1763 object ToolButton9: TToolButton 1764 object ToolButton9: TToolButton
1764 Left = 623 1765 Left = 770
1765 Height = 39 1766 Height = 39
1766 Top = 0 1767 Top = 0
1767 Caption = 'ToolButton9' 1768 Caption = 'ToolButton9'
1768 Style = tbsSeparator 1769 Style = tbsSeparator
1769 end 1770 end
1770 object Label22: TLabel 1771 object Label22: TLabel
1771 Left = 631 1772 Left = 778
1772 Height = 30 1773 Height = 30
1773 Top = 0 1774 Top = 0
1774 Width = 77 1775 Width = 77
@@ -1777,7 +1778,7 @@ object frmTracker: TfrmTracker
1777 ParentFont = False 1778 ParentFont = False
1778 end 1779 end
1779 object Label23: TLabel 1780 object Label23: TLabel
1780 Left = 866 1781 Left = 1013
1781 Height = 30 1782 Height = 30
1782 Top = 0 1783 Top = 0
1783 Width = 125 1784 Width = 125
@@ -1786,7 +1787,7 @@ object frmTracker: TfrmTracker
1786 ParentFont = False 1787 ParentFont = False
1787 end 1788 end
1788 object InstrumentComboBox: TComboBox 1789 object InstrumentComboBox: TComboBox
1789 Left = 991 1790 Left = 1138
1790 Height = 38 1791 Height = 38
1791 Top = 0 1792 Top = 0
1792 Width = 374 1793 Width = 374
@@ -1817,7 +1818,7 @@ object frmTracker: TfrmTracker
1817 Text = '(no instrument)' 1818 Text = '(no instrument)'
1818 end 1819 end
1819 object Label24: TLabel 1820 object Label24: TLabel
1820 Left = 1365 1821 Left = 1512
1821 Height = 30 1822 Height = 30
1822 Top = 0 1823 Top = 0
1823 Width = 64 1824 Width = 64
@@ -1826,7 +1827,7 @@ object frmTracker: TfrmTracker
1826 ParentFont = False 1827 ParentFont = False
1827 end 1828 end
1828 object StepSpinEdit: TSpinEdit 1829 object StepSpinEdit: TSpinEdit
1829 Left = 1429 1830 Left = 1576
1830 Height = 38 1831 Height = 38
1831 Top = 0 1832 Top = 0
1832 Width = 88 1833 Width = 88
@@ -1838,17 +1839,24 @@ object frmTracker: TfrmTracker
1838 object ToolButton3: TToolButton 1839 object ToolButton3: TToolButton
1839 Left = 125 1840 Left = 125
1840 Top = 0 1841 Top = 0
1841 Caption = '▶️' 1842 Caption = '▶️ Start'
1842 ImageIndex = 74 1843 ImageIndex = 74
1843 OnClick = ToolButton3Click 1844 OnClick = ToolButton3Click
1844 end 1845 end
1845 object ExportGBSButton: TToolButton 1846 object ExportGBSButton: TToolButton
1846 Left = 406 1847 Left = 556
1847 Top = 0 1848 Top = 0
1848 Caption = 'Export .GBS' 1849 Caption = 'Export .GBS'
1849 ImageIndex = 77 1850 ImageIndex = 77
1850 OnClick = ExportGBSButtonClick 1851 OnClick = ExportGBSButtonClick
1851 end 1852 end
1853 object ToolButton5: TToolButton
1854 Left = 689
1855 Height = 39
1856 Top = 0
1857 Caption = 'ToolButton5'
1858 Style = tbsDivider
1859 end
1852 end 1860 end
1853 object MainMenu1: TMainMenu 1861 object MainMenu1: TMainMenu
1854 Images = ImageList1 1862 Images = ImageList1
@@ -1895,6 +1903,15 @@ object frmTracker: TfrmTracker
1895 OnClick = MenuItem8Click 1903 OnClick = MenuItem8Click
1896 end 1904 end
1897 end 1905 end
1906 object MenuItem10: TMenuItem
1907 Caption = 'View'
1908 Visible = False
1909 object FontSizeToggleMenuItem: TMenuItem
1910 AutoCheck = True
1911 Caption = 'Pattern grid small font'
1912 OnClick = FontSizeToggleMenuItemClick
1913 end
1914 end
1898 object MenuItem3: TMenuItem 1915 object MenuItem3: TMenuItem
1899 Caption = 'Help' 1916 Caption = 'Help'
1900 object MenuItem15: TMenuItem 1917 object MenuItem15: TMenuItem
@@ -1931,6 +1948,7 @@ object frmTracker: TfrmTracker
1931 end 1948 end
1932 object DebugShiteButton: TMenuItem 1949 object DebugShiteButton: TMenuItem
1933 Caption = 'Debug shite' 1950 Caption = 'Debug shite'
1951 Visible = False
1934 OnClick = DebugShiteButtonClick 1952 OnClick = DebugShiteButtonClick
1935 end 1953 end
1936 end 1954 end
Modifiedtracker.pas +16−6
@@ -24,9 +24,11 @@ type
24 ImageList2: TImageList; 24 ImageList2: TImageList;
25 GBSaveDialog: TSaveDialog; 25 GBSaveDialog: TSaveDialog;
26 Label25: TLabel; 26 Label25: TLabel;
27 MenuItem10: TMenuItem;
27 MenuItem16: TMenuItem; 28 MenuItem16: TMenuItem;
28 MenuItem23: TMenuItem; 29 MenuItem23: TMenuItem;
29 MenuItem24: TMenuItem; 30 MenuItem24: TMenuItem;
31 FontSizeToggleMenuItem: TMenuItem;
30 MenuItem8: TMenuItem; 32 MenuItem8: TMenuItem;
31 NoteHaltTimer: TTimer; 33 NoteHaltTimer: TTimer;
32 StartVolTrackbar: TTrackBar; 34 StartVolTrackbar: TTrackBar;
@@ -35,6 +37,7 @@ type
35 DivRatioTrackbar: TTrackBar; 37 DivRatioTrackbar: TTrackBar;
36 LengthTrackbar: TTrackBar; 38 LengthTrackbar: TTrackBar;
37 SweepSizeTrackbar: TTrackBar; 39 SweepSizeTrackbar: TTrackBar;
40 ToolButton5: TToolButton;
38 WaveSaveDialog: TSaveDialog; 41 WaveSaveDialog: TSaveDialog;
39 Label22: TLabel; 42 Label22: TLabel;
40 Label23: TLabel; 43 Label23: TLabel;
@@ -220,6 +223,7 @@ type
220 procedure MenuItem19Click(Sender: TObject); 223 procedure MenuItem19Click(Sender: TObject);
221 procedure MenuItem21Click(Sender: TObject); 224 procedure MenuItem21Click(Sender: TObject);
222 procedure MenuItem22Click(Sender: TObject); 225 procedure MenuItem22Click(Sender: TObject);
226 procedure FontSizeToggleMenuItemClick(Sender: TObject);
223 procedure MenuItem5Click(Sender: TObject); 227 procedure MenuItem5Click(Sender: TObject);
224 procedure MenuItem8Click(Sender: TObject); 228 procedure MenuItem8Click(Sender: TObject);
225 procedure NoiseVisualizerPaint(Sender: TObject); 229 procedure NoiseVisualizerPaint(Sender: TObject);
@@ -656,9 +660,15 @@ begin
656 end; 660 end;
657 661
658 procedure TfrmTracker.RecreateTrackerGrid; 662 procedure TfrmTracker.RecreateTrackerGrid;
663 var
664 Section: TCollectionItem;
659 begin 665 begin
660 if Assigned(TrackerGrid) then TrackerGrid.Free; 666 if Assigned(TrackerGrid) then TrackerGrid.Free;
661 TrackerGrid := TTrackerGrid.Create(Self, ScrollBox1, Song.Patterns); 667 TrackerGrid := TTrackerGrid.Create(Self, ScrollBox1, Song.Patterns);
668
669 // Fix the size of the channel headers
670 for Section in HeaderControl1.Sections do
671 (Section as THeaderSection).Width := TrackerGrid.ColumnWidth;
662 end; 672 end;
663 673
664 procedure TfrmTracker.LoadInstrument(Instr: Integer); 674 procedure TfrmTracker.LoadInstrument(Instr: Integer);
@@ -855,7 +865,6 @@ end;
855 procedure TfrmTracker.FormCreate(Sender: TObject); 865 procedure TfrmTracker.FormCreate(Sender: TObject);
856 var 866 var
857 I: Integer; 867 I: Integer;
858 Section: TCollectionItem;
859 F: file; 868 F: file;
860 Stream: TStream; 869 Stream: TStream;
861 begin 870 begin
@@ -875,10 +884,6 @@ begin
875 // Initialize ticks per row 884 // Initialize ticks per row
876 Song.TicksPerRow := TicksPerRowSpinEdit.Value; 885 Song.TicksPerRow := TicksPerRowSpinEdit.Value;
877 886
878 // Fix the size of the channel headers
879 for Section in HeaderControl1.Sections do
880 (Section as THeaderSection).Width := TrackerGrid.ColumnWidth;
881
882 LoadInstrument(1); 887 LoadInstrument(1);
883 LoadWave(0); 888 LoadWave(0);
884 889
@@ -1309,6 +1314,11 @@ begin
1309 ReloadPatterns; 1314 ReloadPatterns;
1310 end; 1315 end;
1311 1316
1317 procedure TfrmTracker.FontSizeToggleMenuItemClick(Sender: TObject);
1318 begin
1319
1320 end;
1321
1312 procedure TfrmTracker.MenuItem5Click(Sender: TObject); 1322 procedure TfrmTracker.MenuItem5Click(Sender: TObject);
1313 var 1323 var
1314 AboutForm: TfrmAboutHugeTracker; 1324 AboutForm: TfrmAboutHugeTracker;
@@ -1463,7 +1473,7 @@ begin
1463 PokeSymbol(SYM_ROW, TrackerGrid.Cursor.Y); 1473 PokeSymbol(SYM_ROW, TrackerGrid.Cursor.Y);
1464 1474
1465 EmulationThread.Start; 1475 EmulationThread.Start;
1466 end; 1476 end
1467 end; 1477 end;
1468 1478
1469 procedure TfrmTracker.ToolButton3Click(Sender: TObject); 1479 procedure TfrmTracker.ToolButton3Click(Sender: TObject);