Hold shift (or long press on touch screen) and drag in pattern editor…

… to select part of it. Pattern selection can be dragged, copied, and pasted.
johnnesky · Dec 25, 2020 · 1401fcf · 1401fcf
1 parent f784eda
commit 1401fcf
Show file tree

Hide file tree

Showing 16 changed files with 696 additions and 228 deletions.
diff --git a/editor/BeatsPerBarPrompt.ts b/editor/BeatsPerBarPrompt.ts
@@ -2,7 +2,7 @@
 
 import {Config} from "../synth/SynthConfig";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
-import {SongDocument, StateChangeType} from "./SongDocument";
+import {SongDocument} from "./SongDocument";
 import {Prompt} from "./Prompt";
 import {ChangeBeatsPerBar} from "./changes";
 import {ColorConfig} from "./ColorConfig";
@@ -98,7 +98,7 @@ import {ColorConfig} from "./ColorConfig";
 		private _saveChanges = (): void => {
 			window.localStorage.setItem("beatCountStrategy", this._conversionStrategySelect.value);
 			this._doc.prompt = null;
-			this._doc.record(new ChangeBeatsPerBar(this._doc, BeatsPerBarPrompt._validate(this._beatsStepper), this._conversionStrategySelect.value), StateChangeType.replace);
+			this._doc.record(new ChangeBeatsPerBar(this._doc, BeatsPerBarPrompt._validate(this._beatsStepper), this._conversionStrategySelect.value), true);
 		}
 	}
 //}
diff --git a/editor/ChannelSettingsPrompt.ts b/editor/ChannelSettingsPrompt.ts
@@ -2,7 +2,7 @@
 
 import {Config} from "../synth/SynthConfig";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
-import {SongDocument, StateChangeType} from "./SongDocument";
+import {SongDocument} from "./SongDocument";
 import {Prompt} from "./Prompt";
 import {ChangeGroup} from "./Change";
 import {ChangePatternsPerChannel, ChangeInstrumentsPerChannel, ChangeChannelCount} from "./changes";
@@ -123,7 +123,7 @@ import {ChangePatternsPerChannel, ChangeInstrumentsPerChannel, ChangeChannelCoun
 			group.append(new ChangeInstrumentsPerChannel(this._doc, ChannelSettingsPrompt._validate(this._instrumentsStepper)));
 			group.append(new ChangeChannelCount(this._doc, ChannelSettingsPrompt._validate(this._pitchChannelStepper), ChannelSettingsPrompt._validate(this._drumChannelStepper)));
 			this._doc.prompt = null;
-			this._doc.record(group, StateChangeType.replace);
+			this._doc.record(group, true);
 		}
 	}
 //}
diff --git a/editor/EditorConfig.ts b/editor/EditorConfig.ts
@@ -23,7 +23,7 @@ import {DictionaryArray, BeepBoxOption, InstrumentType, toNameMap} from "../synt
 	}
 
 	export class EditorConfig {
-		public static readonly version: string = "3.0.12";
+		public static readonly version: string = "3.0.13";
 
 		public static readonly versionDisplayName: string = "BeepBox " + EditorConfig.version;
 		public static readonly presetCategories: DictionaryArray<PresetCategory> = toNameMap([

diff --git a/editor/ImportPrompt.ts b/editor/ImportPrompt.ts
@@ -3,7 +3,7 @@
 import {InstrumentType, Config} from "../synth/SynthConfig";
 import {NotePin, Note, makeNotePin, Pattern, Instrument, Channel, Song, Synth} from "../synth/synth";
 import {Preset, EditorConfig} from "./EditorConfig";
-import {SongDocument, StateChangeType} from "./SongDocument";
+import {SongDocument} from "./SongDocument";
 import {Prompt} from "./Prompt";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
 import {ChangeGroup} from "./Change";
@@ -57,7 +57,7 @@ import {ArrayBufferReader} from "./ArrayBufferReader";
 				reader.addEventListener("load", (event: Event): void => {
 					this._doc.prompt = null;
 					this._doc.goBackToStart();
-					this._doc.record(new ChangeSong(this._doc, <string>reader.result), StateChangeType.replace, true);
+					this._doc.record(new ChangeSong(this._doc, <string>reader.result), true, true);
 				});
 				reader.readAsText(file);
 			} else if (extension == "midi" || extension == "mid") {
@@ -860,7 +860,7 @@ import {ArrayBufferReader} from "./ArrayBufferReader";
 			this._doc.goBackToStart();
 			for (const channel of this._doc.song.channels) channel.muted = false;
 			this._doc.prompt = null;
-			this._doc.record(new ChangeImportMidi(this._doc), StateChangeType.replace, true);
+			this._doc.record(new ChangeImportMidi(this._doc), true, true);
 		}
 	}
 //}
diff --git a/editor/MoveNotesSidewaysPrompt.ts b/editor/MoveNotesSidewaysPrompt.ts
@@ -2,7 +2,7 @@
 
 import {Config} from "../synth/SynthConfig";
 import {HTML} from "imperative-html/dist/esm/elements-strict";
-import {SongDocument, StateChangeType} from "./SongDocument";
+import {SongDocument} from "./SongDocument";
 import {Prompt} from "./Prompt";
 import {ChangeMoveNotesSideways} from "./changes";
 import {ColorConfig} from "./ColorConfig";
@@ -84,7 +84,7 @@ import {ColorConfig} from "./ColorConfig";
 		private _saveChanges = (): void => {
 			window.localStorage.setItem("moveNotesSidewaysStrategy", this._conversionStrategySelect.value);
 			this._doc.prompt = null;
-			this._doc.record(new ChangeMoveNotesSideways(this._doc, +this._beatsStepper.value, this._conversionStrategySelect.value), StateChangeType.replace);
+			this._doc.record(new ChangeMoveNotesSideways(this._doc, +this._beatsStepper.value, this._conversionStrategySelect.value), true);
 		}
 	}
 //}
diff --git a/editor/OctaveScrollBar.ts b/editor/OctaveScrollBar.ts
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 John Nesky, distributed under the MIT license.
 
 import {Config} from "../synth/SynthConfig";
-import {SongDocument, StateChangeType} from "./SongDocument";
+import {SongDocument} from "./SongDocument";
 import {HTML, SVG} from "imperative-html/dist/esm/elements-strict";
 import {ChangeOctave} from "./changes";
 import {ColorConfig} from "./ColorConfig";
@@ -175,12 +175,12 @@ import {ColorConfig} from "./ColorConfig";
 					if (this._mouseY < this._barBottom - this._barHeight * 0.5) {
 						if (currentOctave < Config.scrollableOctaves) {
 							this._change = new ChangeOctave(this._doc, oldValue, currentOctave + 1);
-							this._doc.record(this._change, canReplaceLastChange ? StateChangeType.replace : StateChangeType.push);
+							this._doc.record(this._change, canReplaceLastChange);
 						}
 					} else {
 						if (currentOctave > 0) {
 							this._change = new ChangeOctave(this._doc, oldValue, currentOctave - 1);
-							this._doc.record(this._change, canReplaceLastChange ? StateChangeType.replace : StateChangeType.push);
+							this._doc.record(this._change, canReplaceLastChange);
 						}
 					}
 				}