Skip to content

Commit 6eb2669

Browse files
committed
and now reduce grid column counts
1 parent 329e420 commit 6eb2669

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

godot/scenes/SongDisplay.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private void LoadSong() {
3636
GetNode<Label>("ArtistLabel").Text = "Artist: " + songInfo.Metadata.Artist;
3737
GetNode<Label>("SongNameLabel").Text = "Name: " + songInfo.Metadata.Name;
3838
GetNode<Label>("AlbumLabel").Text = "Album: " + songInfo.Metadata.Album;
39-
GetNode<Label>("YearLabel").Text = "Year:" + songInfo.Metadata.Year.ToString();
39+
GetNode<Label>("YearLabel").Text = "Year: " + songInfo.Metadata.Year.ToString();
4040
GetNode<Label>("OtherLabel").Text = "Length: " + songInfo.Metadata.SongLength.ToMinSec();
4141

4242
var grid = GetNode<GridContainer>("InstrumentGridContainer");

godot/scenes/SongList.cs

+2-10
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ public Row(SongFile song, Action<SongFile> buttonAction) {
5656
CreateLabel(song.Album.FixedWidthString(20)),
5757
CreateLabel(song.Year.ToString()),
5858
CreateLabel(song.Length.ToMinSec()),
59-
CreateLabel(song.GetInstrumentChars()),
60-
CreateLabel(mainI?.Name),
61-
CreateLabel(Instrument.CalcTuningName(mainI?.Tuning)),
62-
CreateLabel(mainI?.NoteCount.ToString()),
63-
CreateLabel(mainI?.GetNoteDensity(song).ToFixedPlaces(2, false))
59+
CreateLabel(song.GetInstrumentChars())
6460
};
6561
}
6662

@@ -87,11 +83,7 @@ private void RowSelectedForReal(InputEvent @event)
8783
new Column("Album", (s) => s.Album),
8884
new Column("Year", (s) => s.Year),
8985
new Column("Length", (s) => s.Length),
90-
new Column("Parts", (s) => s.GetInstrumentChars()),
91-
new Column("Main", (s) => s.GetMainInstrument()?.Name),
92-
new Column("Tuning", (s) => Instrument.CalcTuningName(s.GetMainInstrument()?.Tuning, s.GetMainInstrument()?.CapoFret)),
93-
new Column("Notes", (s) => s.GetMainInstrument()?.GetNoteDensity(s)),
94-
new Column("Density", (s) => s.GetMainInstrument()?.NoteCount),
86+
new Column("Parts", (s) => s.GetInstrumentChars())
9587
};
9688

9789
private readonly List<Row> _rows;

0 commit comments

Comments
 (0)