broken changes

This commit is contained in:
Mark Gregory
2026-11-05 12:19:00 +00:00
parent 2ac7619ee1
commit 528e10b43a
3 changed files with 22 additions and 6 deletions
+16 -5
View File
@@ -65,7 +65,9 @@ struct SongDragReference: Codable, Sendable {
@Published var activeSection = "Library"
@Published var studio = StudioSettings() { didSet { applyStudioSettings(save:true,previous:oldValue) } }
let backgroundDeck = BackgroundDeck()
#if KJMIX_DJ_CONSOLE
let dj = DJSystem()
#endif
var backgroundAutomationReady = false
var backgroundPlaybackObserver: AnyCancellable?
var backgroundHandoff: Task<Void,Never>?
@@ -717,8 +719,7 @@ struct LibraryView: View {
}
private var selectedSong: Song? { model.songs.first { $0.id == selected } }
private var workspace: some View {
VSplitView {
private var libraryWorkspace: some View {
HSplitView {
sidebar.frame(minWidth:220,idealWidth:240,maxWidth:260)
VStack(spacing:0) {
@@ -754,9 +755,19 @@ struct LibraryView: View {
footer.padding(.horizontal,18).padding(.vertical,8)
}.frame(minWidth:780)
}
.frame(minHeight:400)
DJConsole(model:model,system:model.dj).frame(minHeight:400,idealHeight:470)
}
@ViewBuilder private var workspaceLayout: some View {
#if KJMIX_DJ_CONSOLE
VSplitView {
libraryWorkspace.frame(minHeight:400)
DJConsole(model:model,system:model.dj).frame(minHeight:400,idealHeight:470)
}
#else
libraryWorkspace
#endif
}
private var workspace: some View {
workspaceLayout
.background(StudioTheme.frame)
.tint(.accentColor)
.focusedSceneValue(\.nameReinterpretation,NameReinterpretationCommands(perform:{beginReinterpretation()},enabled:["Library","Singer Songs"].contains(source) && (selectedSong != nil || !tableSelection.isEmpty)))
@@ -1016,7 +1027,7 @@ struct LibraryView: View {
}.width(65)
TableColumn("Tempo") { song in
Picker("Tempo",selection:Binding(get:{model.tuningForControls(song.id).tempo},set:{model.updateTuning(song.id,tempo:$0)})) {
ForEach(10..<31) { Text("\($0*5)%").tag(Double($0)/20) }
ForEach(50...150,id:\.self) { Text("\($0)%").tag(Double($0)/100) }
}.labelsHidden().controlSize(.small)
}.width(78)
TableColumn("Rating",value:\Song.rating) { song in