mirror of
https://github.com/vsariola/sointu.git
synced 2025-07-23 07:24:47 -04:00
drafting
This commit is contained in:
parent
d276f52942
commit
6b92ec10cc
@ -42,13 +42,13 @@ type (
|
||||
|
||||
DialogState *DialogState
|
||||
|
||||
ModalDialog layout.Widget
|
||||
InstrumentEditor *InstrumentEditor
|
||||
OrderEditor *OrderEditor
|
||||
TrackEditor *NoteEditor
|
||||
Explorer *explorer.Explorer
|
||||
Exploring bool
|
||||
SongPanel *SongPanel
|
||||
ModalDialog layout.Widget
|
||||
PatchPanel *PatchPanel
|
||||
OrderEditor *OrderEditor
|
||||
TrackEditor *NoteEditor
|
||||
Explorer *explorer.Explorer
|
||||
Exploring bool
|
||||
SongPanel *SongPanel
|
||||
|
||||
filePathString tracker.String
|
||||
noteEvents []tracker.NoteEvent
|
||||
@ -83,10 +83,10 @@ func NewTracker(model *tracker.Model) *Tracker {
|
||||
BottomHorizontalSplit: &SplitState{Ratio: -.6},
|
||||
VerticalSplit: &SplitState{Axis: layout.Vertical},
|
||||
|
||||
DialogState: new(DialogState),
|
||||
InstrumentEditor: NewInstrumentEditor(model),
|
||||
OrderEditor: NewOrderEditor(model),
|
||||
TrackEditor: NewNoteEditor(model),
|
||||
DialogState: new(DialogState),
|
||||
PatchPanel: NewPatchPanel(model),
|
||||
OrderEditor: NewOrderEditor(model),
|
||||
TrackEditor: NewNoteEditor(model),
|
||||
|
||||
Zoom: 6,
|
||||
|
||||
@ -118,7 +118,6 @@ func NewTracker(model *tracker.Model) *Tracker {
|
||||
}
|
||||
|
||||
func (t *Tracker) Main() {
|
||||
t.InstrumentEditor.Focus()
|
||||
recoveryTicker := time.NewTicker(time.Second * 30)
|
||||
var ops op.Ops
|
||||
titlePath := ""
|
||||
@ -359,7 +358,7 @@ func (t *Tracker) layoutTop(gtx layout.Context) layout.Dimensions {
|
||||
return t.SongPanel.Layout(gtx, t)
|
||||
},
|
||||
func(gtx C) D {
|
||||
return t.InstrumentEditor.Layout(gtx, t)
|
||||
return t.PatchPanel.Layout(gtx, t)
|
||||
},
|
||||
)
|
||||
}
|
||||
@ -392,3 +391,12 @@ func (t *Tracker) openUrl(url string) {
|
||||
t.Alerts().Add(err.Error(), tracker.Error)
|
||||
}
|
||||
}
|
||||
|
||||
func (t *Tracker) Tags(curLevel int, yield TagYieldFunc) bool {
|
||||
ret := t.PatchPanel.Tags(curLevel+1, yield)
|
||||
if !t.InstrEnlarged().Value() {
|
||||
ret = ret && t.OrderEditor.Tags(curLevel+1, yield) &&
|
||||
t.TrackEditor.Tags(curLevel+1, yield)
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
Reference in New Issue
Block a user