Commit 852863b

Nick Faro committed on
Fixes to subpattern editor
commit 852863b10d51f2eda9e0509bcba6b9a0d7e9fa25 parent 350a156
5 changed files +34−31
Modifiedcodegen.pas +2−2
@@ -335,10 +335,10 @@ begin
335 SL.Delimiter := ','; 335 SL.Delimiter := ',';
336 SL.StrictDelimiter := True; 336 SL.StrictDelimiter := True;
337 337
338 if (Cell.Note = NO_NOTE) or (Cell.Note = MIDDLE_NOTE) then 338 if (Cell.Note = NO_NOTE) then
339 SL.Add('___') 339 SL.Add('___')
340 else 340 else
341 SL.Add(IntToStr(Abs(Cell.Note - MIDDLE_NOTE))); 341 SL.Add(IntToStr(Cell.Note - MIDDLE_NOTE));
342 342
343 SL.Add(IntToStr(Cell.Volume)); 343 SL.Add(IntToStr(Cell.Volume));
344 344
ModifiedhUGEDriver +1−1
@@ -1 +1 @@
1 Subproject commit bfbfc81b6d9a40c9ca119e2976c6933e99c9ab5a 1 Subproject commit 4ade1eba36343954d9488090610562e52b494235
Modifiedtracker.lfm +4−2
@@ -1,7 +1,7 @@
1 object frmTracker: TfrmTracker 1 object frmTracker: TfrmTracker
2 Left = 596 2 Left = 1448
3 Height = 857 3 Height = 857
4 Top = 455 4 Top = 284
5 Width = 1318 5 Width = 1318
6 AllowDropFiles = True 6 AllowDropFiles = True
7 Caption = 'hUGETracker' 7 Caption = 'hUGETracker'
@@ -961,6 +961,8 @@ object frmTracker: TfrmTracker
961 ClientHeight = 670 961 ClientHeight = 670
962 ClientWidth = 305 962 ClientWidth = 305
963 TabOrder = 0 963 TabOrder = 0
964 OnMouseWheelDown = ScrollBox1MouseWheelDown
965 OnMouseWheelUp = ScrollBox1MouseWheelUp
964 object RowNumberStringGrid1: TStringGrid 966 object RowNumberStringGrid1: TStringGrid
965 Left = 273 967 Left = 273
966 Height = 670 968 Height = 670
Modifiedtracker.pas +25−24
@@ -1130,9 +1130,10 @@ begin
1130 TableGrid := TTableGrid.Create(Self, ScrollBox2, SubpatternMap, 1); 1130 TableGrid := TTableGrid.Create(Self, ScrollBox2, SubpatternMap, 1);
1131 1131
1132 TableGrid.FontSize := TrackerSettings.PatternEditorFontSize; 1132 TableGrid.FontSize := TrackerSettings.PatternEditorFontSize;
1133 TableGrid.Left := RowNumberStringGrid1.Left - TableGrid.Width;
1134 TableGrid.PopupMenu := TrackerGridPopup;
1133 RowNumberStringGrid1.DefaultRowHeight := TrackerGrid.RowHeight; 1135 RowNumberStringGrid1.DefaultRowHeight := TrackerGrid.RowHeight;
1134 RowNumberStringGrid1.DisabledFontColor := RowNumberStringGrid1.Font.Color; 1136 RowNumberStringGrid1.DisabledFontColor := RowNumberStringGrid1.Font.Color;
1135 TableGrid.Left := RowNumberStringGrid1.Left - TableGrid.Width;
1136 1137
1137 // Fix the size of the channel headers 1138 // Fix the size of the channel headers
1138 for I := 1 to HeaderControl1.Sections.Count-1 do 1139 for I := 1 to HeaderControl1.Sections.Count-1 do
@@ -1888,9 +1889,9 @@ begin
1888 if ssCtrl in Shift then begin 1889 if ssCtrl in Shift then begin
1889 Handled := True; 1890 Handled := True;
1890 if ssShift in Shift then 1891 if ssShift in Shift then
1891 TrackerGrid.IncrementSelection(-12, -10, -0, -0, -$10) 1892 (ActiveControl as TTrackerGrid).IncrementSelection(-12, -10, -0, -0, -$10)
1892 else 1893 else
1893 TrackerGrid.IncrementSelection(-1, -1, -0, -0, -1); 1894 (ActiveControl as TTrackerGrid).IncrementSelection(-1, -1, -0, -0, -1);
1894 end 1895 end
1895 else 1896 else
1896 Handled := False; 1897 Handled := False;
@@ -1902,9 +1903,9 @@ begin
1902 if ssCtrl in Shift then begin 1903 if ssCtrl in Shift then begin
1903 Handled := True; 1904 Handled := True;
1904 if ssShift in Shift then 1905 if ssShift in Shift then
1905 TrackerGrid.IncrementSelection(12, 10, 0, 0, $10) 1906 (ActiveControl as TTrackerGrid).IncrementSelection(12, 10, 0, 0, $10)
1906 else 1907 else
1907 TrackerGrid.IncrementSelection(1, 1, 0, 0, 1); 1908 (ActiveControl as TTrackerGrid).IncrementSelection(1, 1, 0, 0, 1);
1908 end 1909 end
1909 else 1910 else
1910 Handled := False; 1911 Handled := False;
@@ -2208,7 +2209,7 @@ end;
2208 2209
2209 procedure TfrmTracker.MenuItem31Click(Sender: TObject); 2210 procedure TfrmTracker.MenuItem31Click(Sender: TObject);
2210 begin 2211 begin
2211 TrackerGrid.InterpolateSelection; 2212 (ActiveControl as TTrackerGrid).InterpolateSelection;
2212 end; 2213 end;
2213 2214
2214 procedure TfrmTracker.MenuItem33Click(Sender: TObject); 2215 procedure TfrmTracker.MenuItem33Click(Sender: TObject);
@@ -2246,22 +2247,22 @@ end;
2246 2247
2247 procedure TfrmTracker.OnIncrementValueBy1Click(Sender: TObject); 2248 procedure TfrmTracker.OnIncrementValueBy1Click(Sender: TObject);
2248 begin 2249 begin
2249 TrackerGrid.IncrementSelection(1, 1, 0, 0, 1); 2250 (ActiveControl as TTrackerGrid).IncrementSelection(1, 1, 0, 0, 1);
2250 end; 2251 end;
2251 2252
2252 procedure TfrmTracker.OnDecrementValueBy1Click(Sender: TObject); 2253 procedure TfrmTracker.OnDecrementValueBy1Click(Sender: TObject);
2253 begin 2254 begin
2254 TrackerGrid.IncrementSelection(-1, -1, 0, 0, -1); 2255 (ActiveControl as TTrackerGrid).IncrementSelection(-1, -1, 0, 0, -1);
2255 end; 2256 end;
2256 2257
2257 procedure TfrmTracker.OnIncrementValueBy10Click(Sender: TObject); 2258 procedure TfrmTracker.OnIncrementValueBy10Click(Sender: TObject);
2258 begin 2259 begin
2259 TrackerGrid.IncrementSelection(12, 10, 0, 0, $10); 2260 (ActiveControl as TTrackerGrid).IncrementSelection(12, 10, 0, 0, $10);
2260 end; 2261 end;
2261 2262
2262 procedure TfrmTracker.OnDecrementValueBy10Click(Sender: TObject); 2263 procedure TfrmTracker.OnDecrementValueBy10Click(Sender: TObject);
2263 begin 2264 begin
2264 TrackerGrid.IncrementSelection(-12, -10, 0, 0, -$10); 2265 (ActiveControl as TTrackerGrid).IncrementSelection(-12, -10, 0, 0, -$10);
2265 end; 2266 end;
2266 2267
2267 procedure TfrmTracker.MenuItem5Click(Sender: TObject); 2268 procedure TfrmTracker.MenuItem5Click(Sender: TObject);
@@ -2420,80 +2421,80 @@ end;
2420 2421
2421 procedure TfrmTracker.TrackerPopupCopyClick(Sender: TObject); 2422 procedure TfrmTracker.TrackerPopupCopyClick(Sender: TObject);
2422 begin 2423 begin
2423 SendMessage(TrackerGrid.Handle, LM_COPY, 0, 0) 2424 SendMessage((ActiveControl as TTrackerGrid).Handle, LM_COPY, 0, 0)
2424 end; 2425 end;
2425 2426
2426 procedure TfrmTracker.TrackerPopupCutClick(Sender: TObject); 2427 procedure TfrmTracker.TrackerPopupCutClick(Sender: TObject);
2427 begin 2428 begin
2428 SendMessage(TrackerGrid.Handle, LM_CUT, 0, 0) 2429 SendMessage((ActiveControl as TTrackerGrid).Handle, LM_CUT, 0, 0)
2429 end; 2430 end;
2430 2431
2431 procedure TfrmTracker.TrackerPopupEditEffectClick(Sender: TObject); 2432 procedure TfrmTracker.TrackerPopupEditEffectClick(Sender: TObject);
2432 begin 2433 begin
2433 TrackerGrid.OpenEffectEditor; 2434 (ActiveControl as TTrackerGrid).OpenEffectEditor;
2434 end; 2435 end;
2435 2436
2436 procedure TfrmTracker.TrackerPopupEraseClick(Sender: TObject); 2437 procedure TfrmTracker.TrackerPopupEraseClick(Sender: TObject);
2437 begin 2438 begin
2438 TrackerGrid.EraseSelection 2439 (ActiveControl as TTrackerGrid).EraseSelection
2439 end; 2440 end;
2440 2441
2441 procedure TfrmTracker.TrackerPopupFloodPasteClick(Sender: TObject); 2442 procedure TfrmTracker.TrackerPopupFloodPasteClick(Sender: TObject);
2442 begin 2443 begin
2443 TrackerGrid.DoRepeatPaste 2444 (ActiveControl as TTrackerGrid).DoRepeatPaste;
2444 end; 2445 end;
2445 2446
2446 procedure TfrmTracker.TrackerPopupPasteClick(Sender: TObject); 2447 procedure TfrmTracker.TrackerPopupPasteClick(Sender: TObject);
2447 begin 2448 begin
2448 SendMessage(TrackerGrid.Handle, LM_PASTE, 0, 0) 2449 SendMessage((ActiveControl as TTrackerGrid).Handle, LM_PASTE, 0, 0)
2449 end; 2450 end;
2450 2451
2451 procedure TfrmTracker.TrackerPopupRedoClick(Sender: TObject); 2452 procedure TfrmTracker.TrackerPopupRedoClick(Sender: TObject);
2452 begin 2453 begin
2453 TrackerGrid.DoRedo 2454 (ActiveControl as TTrackerGrid).DoRedo
2454 end; 2455 end;
2455 2456
2456 procedure TfrmTracker.TrackerPopupSelectAllClick(Sender: TObject); 2457 procedure TfrmTracker.TrackerPopupSelectAllClick(Sender: TObject);
2457 begin 2458 begin
2458 TrackerGrid.SelectAll 2459 (ActiveControl as TTrackerGrid).SelectAll
2459 end; 2460 end;
2460 2461
2461 procedure TfrmTracker.TrackerPopupSelectChannelClick(Sender: TObject); 2462 procedure TfrmTracker.TrackerPopupSelectChannelClick(Sender: TObject);
2462 begin 2463 begin
2463 TrackerGrid.SelectColumn 2464 (ActiveControl as TTrackerGrid).SelectColumn
2464 end; 2465 end;
2465 2466
2466 procedure TfrmTracker.TrackerPopupTransposeOctaveDownClick(Sender: TObject); 2467 procedure TfrmTracker.TrackerPopupTransposeOctaveDownClick(Sender: TObject);
2467 begin 2468 begin
2468 TrackerGrid.TransposeSelection(-12); 2469 (ActiveControl as TTrackerGrid).TransposeSelection(-12);
2469 if TrackerSettings.PreviewWhenBumping then 2470 if TrackerSettings.PreviewWhenBumping then
2470 PreviewNoteUnderCursor; 2471 PreviewNoteUnderCursor;
2471 end; 2472 end;
2472 2473
2473 procedure TfrmTracker.TrackerPopupTransposeOctaveUpClick(Sender: TObject); 2474 procedure TfrmTracker.TrackerPopupTransposeOctaveUpClick(Sender: TObject);
2474 begin 2475 begin
2475 TrackerGrid.TransposeSelection(12); 2476 (ActiveControl as TTrackerGrid).TransposeSelection(12);
2476 if TrackerSettings.PreviewWhenBumping then 2477 if TrackerSettings.PreviewWhenBumping then
2477 PreviewNoteUnderCursor; 2478 PreviewNoteUnderCursor;
2478 end; 2479 end;
2479 2480
2480 procedure TfrmTracker.TrackerPopupTransposeSemiDownClick(Sender: TObject); 2481 procedure TfrmTracker.TrackerPopupTransposeSemiDownClick(Sender: TObject);
2481 begin 2482 begin
2482 TrackerGrid.TransposeSelection(-1); 2483 (ActiveControl as TTrackerGrid).TransposeSelection(-1);
2483 if TrackerSettings.PreviewWhenBumping then 2484 if TrackerSettings.PreviewWhenBumping then
2484 PreviewNoteUnderCursor; 2485 PreviewNoteUnderCursor;
2485 end; 2486 end;
2486 2487
2487 procedure TfrmTracker.TrackerPopupTransposeSemiUpClick(Sender: TObject); 2488 procedure TfrmTracker.TrackerPopupTransposeSemiUpClick(Sender: TObject);
2488 begin 2489 begin
2489 TrackerGrid.TransposeSelection(1); 2490 (ActiveControl as TTrackerGrid).TransposeSelection(1);
2490 if TrackerSettings.PreviewWhenBumping then 2491 if TrackerSettings.PreviewWhenBumping then
2491 PreviewNoteUnderCursor; 2492 PreviewNoteUnderCursor;
2492 end; 2493 end;
2493 2494
2494 procedure TfrmTracker.TrackerPopupUndoClick(Sender: TObject); 2495 procedure TfrmTracker.TrackerPopupUndoClick(Sender: TObject);
2495 begin 2496 begin
2496 TrackerGrid.DoUndo 2497 (ActiveControl as TTrackerGrid).DoUndo
2497 end; 2498 end;
2498 2499
2499 procedure TfrmTracker.TreeView1DblClick(Sender: TObject); 2500 procedure TfrmTracker.TreeView1DblClick(Sender: TObject);
Modifiedtrackergrid.pas +2−2
@@ -198,11 +198,11 @@ begin
198 with Canvas do begin 198 with Canvas do begin
199 Font.Color := clNote; 199 Font.Color := clNote;
200 200
201 if (Cell.Note = NO_NOTE) or (Cell.Note = MIDDLE_NOTE) then begin 201 if (Cell.Note = NO_NOTE) then begin
202 Font.Color := clDots; 202 Font.Color := clDots;
203 TextOut(PenPos.X, PenPos.Y, '...') 203 TextOut(PenPos.X, PenPos.Y, '...')
204 end 204 end
205 else if Cell.Note > MIDDLE_NOTE then 205 else if Cell.Note >= MIDDLE_NOTE then
206 TextOut(PenPos.X, PenPos.Y, '+'+FormatFloat('00', Cell.Note - MIDDLE_NOTE)) 206 TextOut(PenPos.X, PenPos.Y, '+'+FormatFloat('00', Cell.Note - MIDDLE_NOTE))
207 else if Cell.Note < MIDDLE_NOTE then 207 else if Cell.Note < MIDDLE_NOTE then
208 TextOut(PenPos.X, PenPos.Y, '-'+FormatFloat('00', MIDDLE_NOTE - Cell.Note)); 208 TextOut(PenPos.X, PenPos.Y, '-'+FormatFloat('00', MIDDLE_NOTE - Cell.Note));