mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-07-25 00:15:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

tracker: remove old unused code

Browse Source
This commit is contained in:
vsariola
2021-02-16 08:47:48 +02:00
parent f8ec857c16
commit 366a05c766
3 changed files with 10 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tracker/songpanel.go
View File

@ -49,7 +49,7 @@ func (t *Tracker) layoutMenuBar(gtx C) D {
gtx.Constraints.Max.Y = gtx.Px(unit.Dp(36))
gtx.Constraints.Min.Y = gtx.Px(unit.Dp(36))
for clickedItem, hasClicked := t.FileMenu.Clicked(); hasClicked; {
for clickedItem, hasClicked := t.Menus[0].Clicked(); hasClicked; {
switch clickedItem {
case 0:
t.LoadSong(defaultSong.Copy())
@ -58,10 +58,10 @@ func (t *Tracker) layoutMenuBar(gtx C) D {
case 2:
t.SaveSongFile()
}
clickedItem, hasClicked = t.FileMenu.Clicked()
clickedItem, hasClicked = t.Menus[0].Clicked()
}
for clickedItem, hasClicked := t.EditMenu.Clicked(); hasClicked; {
for clickedItem, hasClicked := t.Menus[1].Clicked(); hasClicked; {
switch clickedItem {
case 0:
t.Undo()
@ -72,9 +72,9 @@ func (t *Tracker) layoutMenuBar(gtx C) D {
clipboard.WriteOp{Text: string(contents)}.Add(gtx.Ops)
}
case 3:
clipboard.ReadOp{Tag: t.EditMenu}.Add(gtx.Ops)
clipboard.ReadOp{Tag: &t.Menus[1]}.Add(gtx.Ops)
}
clickedItem, hasClicked = t.FileMenu.Clicked()
clickedItem, hasClicked = t.Menus[1].Clicked()
}
shortcutKey := "Ctrl+"
@ -82,12 +82,12 @@ func (t *Tracker) layoutMenuBar(gtx C) D {
shortcutKey = "Cmd+"
}
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(t.layoutMenu("File", &t.MenuBar[0], t.FileMenu, unit.Dp(200),
layout.Rigid(t.layoutMenu("File", &t.MenuBar[0], &t.Menus[0], unit.Dp(200),
MenuItem{IconBytes: icons.ContentClear, Text: "New Song", ShortcutText: shortcutKey + "N"},
MenuItem{IconBytes: icons.FileFolder, Text: "Open Song", ShortcutText: shortcutKey + "O"},
MenuItem{IconBytes: icons.ContentSave, Text: "Save Song", ShortcutText: shortcutKey + "S"},
)),
layout.Rigid(t.layoutMenu("Edit", &t.MenuBar[1], t.EditMenu, unit.Dp(160),
layout.Rigid(t.layoutMenu("Edit", &t.MenuBar[1], &t.Menus[1], unit.Dp(160),
MenuItem{IconBytes: icons.ContentUndo, Text: "Undo", ShortcutText: shortcutKey + "Z", Disabled: len(t.undoStack) == 0},
MenuItem{IconBytes: icons.ContentRedo, Text: "Redo", ShortcutText: shortcutKey + "Y", Disabled: len(t.redoStack) == 0},
MenuItem{IconBytes: icons.ContentContentCopy, Text: "Copy", ShortcutText: shortcutKey + "C"},