Commit ffa4946

Nick committed on
Fix order re-arrangement bug
commit ffa49460fcb051ce764f69950873bc1d9e99f2db parent bf52286
2 changed files +7−9
Modifiedtracker.lfm +1−1
@@ -299,7 +299,6 @@ object frmTracker: TfrmTracker
299 OnColRowDeleted = OrderEditStringGridColRowDeleted 299 OnColRowDeleted = OrderEditStringGridColRowDeleted
300 OnColRowExchanged = OrderEditStringGridColRowExchanged 300 OnColRowExchanged = OrderEditStringGridColRowExchanged
301 OnColRowInserted = OrderEditStringGridColRowInserted 301 OnColRowInserted = OrderEditStringGridColRowInserted
302 OnColRowMoved = OrderEditStringGridColRowMoved
303 OnDblClick = OrderEditStringGridDblClick 302 OnDblClick = OrderEditStringGridDblClick
304 OnKeyDown = OrderEditStringGridKeyDown 303 OnKeyDown = OrderEditStringGridKeyDown
305 OnValidateEntry = OrderEditStringGridValidateEntry 304 OnValidateEntry = OrderEditStringGridValidateEntry
@@ -2024,6 +2023,7 @@ object frmTracker: TfrmTracker
2024 object DebugShiteButton: TMenuItem 2023 object DebugShiteButton: TMenuItem
2025 Caption = 'Debug shite' 2024 Caption = 'Debug shite'
2026 Visible = False 2025 Visible = False
2026 OnClick = DebugShiteButtonClick
2027 end 2027 end
2028 end 2028 end
2029 object MenuBarActionList: TActionList 2029 object MenuBarActionList: TActionList
Modifiedtracker.pas +6−8
@@ -258,6 +258,7 @@ type
258 TreeView1: TTreeView; 258 TreeView1: TTreeView;
259 TrackerGrid: TTrackerGrid; 259 TrackerGrid: TTrackerGrid;
260 procedure Button1Click(Sender: TObject); 260 procedure Button1Click(Sender: TObject);
261 procedure DebugShiteButtonClick(Sender: TObject);
261 procedure DecrementCurrentInstrumentActionExecute(Sender: TObject); 262 procedure DecrementCurrentInstrumentActionExecute(Sender: TObject);
262 procedure DeleteRowActionExecute(Sender: TObject); 263 procedure DeleteRowActionExecute(Sender: TObject);
263 procedure DeleteRowActionUpdate(Sender: TObject); 264 procedure DeleteRowActionUpdate(Sender: TObject);
@@ -360,8 +361,6 @@ type
360 IsColumn: Boolean; sIndex, tIndex: Integer); 361 IsColumn: Boolean; sIndex, tIndex: Integer);
361 procedure OrderEditStringGridColRowInserted(Sender: TObject; 362 procedure OrderEditStringGridColRowInserted(Sender: TObject;
362 IsColumn: Boolean; sIndex, tIndex: Integer); 363 IsColumn: Boolean; sIndex, tIndex: Integer);
363 procedure OrderEditStringGridColRowMoved(Sender: TObject;
364 IsColumn: Boolean; sIndex, tIndex: Integer);
365 procedure OrderEditStringGridDblClick(Sender: TObject); 364 procedure OrderEditStringGridDblClick(Sender: TObject);
366 procedure OrderEditStringGridKeyDown(Sender: TObject; var Key: Word; 365 procedure OrderEditStringGridKeyDown(Sender: TObject; var Key: Word;
367 Shift: TShiftState); 366 Shift: TShiftState);
@@ -1897,6 +1896,11 @@ begin
1897 PreviewC5; 1896 PreviewC5;
1898 end; 1897 end;
1899 1898
1899 procedure TfrmTracker.DebugShiteButtonClick(Sender: TObject);
1900 begin
1901 Writeln('current row is ', OrderEditStringGrid.row);
1902 end;
1903
1900 procedure TfrmTracker.DecrementCurrentInstrumentActionExecute(Sender: TObject); 1904 procedure TfrmTracker.DecrementCurrentInstrumentActionExecute(Sender: TObject);
1901 begin 1905 begin
1902 InstrumentComboBox.ItemIndex := EnsureRange(InstrumentComboBox.ItemIndex-1, 0, InstrumentComboBox.Items.Count-1); 1906 InstrumentComboBox.ItemIndex := EnsureRange(InstrumentComboBox.ItemIndex-1, 0, InstrumentComboBox.Items.Count-1);
@@ -2266,12 +2270,6 @@ begin
2266 ReloadPatterns; 2270 ReloadPatterns;
2267 end; 2271 end;
2268 2272
2269 procedure TfrmTracker.OrderEditStringGridColRowMoved(Sender: TObject;
2270 IsColumn: Boolean; sIndex, tIndex: Integer);
2271 begin
2272 ReloadPatterns;
2273 end;
2274
2275 procedure TfrmTracker.OrderEditStringGridDblClick(Sender: TObject); 2273 procedure TfrmTracker.OrderEditStringGridDblClick(Sender: TObject);
2276 var 2274 var
2277 Highest: Integer; 2275 Highest: Integer;