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

feat(track/gioui): ctrl + scrollwheel adjusts global GUI zoom

Browse Source 
Closes #153
This commit is contained in:
5684185+vsariola@users.noreply.github.com
2025-05-01 19:16:39 +03:00
parent 0f42a993dc
commit 8245fbda24
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tracker/gioui/tracker.go
View File

@ -10,6 +10,7 @@ import (
"gioui.org/app"
"gioui.org/io/event"
"gioui.org/io/key"
"gioui.org/io/pointer"
"gioui.org/io/system"
"gioui.org/io/transfer"
"gioui.org/layout"
@ -35,6 +36,7 @@ type (
KeyPlaying map[key.Name]tracker.NoteID
MidiNotePlaying []byte
PopupAlert *PopupAlert
Zoom int
SaveChangesDialog *Dialog
WaveTypeDialog *Dialog
@ -65,6 +67,8 @@ const (
ConfirmNew
)
var ZoomFactors = []float32{.25, 1. / 3, .5, 2. / 3, .75, .8, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5}
func NewTracker(model *tracker.Model) *Tracker {
t := &Tracker{
Theme: material.NewTheme(),
@ -84,6 +88,8 @@ func NewTracker(model *tracker.Model) *Tracker {
TrackEditor: NewNoteEditor(model),
SongPanel: NewSongPanel(model),
Zoom: 6,
Model: model,
filePathString: model.FilePath().String(),
@ -184,7 +190,13 @@ func titleFromPath(path string) string {
}
func (t *Tracker) Layout(gtx layout.Context, w *app.Window) {
paint.FillShape(gtx.Ops, backgroundColor, clip.Rect(image.Rect(0, 0, gtx.Constraints.Max.X, gtx.Constraints.Max.Y)).Op())
zoomFactor := ZoomFactors[t.Zoom]
gtx.Metric.PxPerDp *= zoomFactor
gtx.Metric.PxPerSp *= zoomFactor
defer clip.Rect(image.Rectangle{Max: gtx.Constraints.Max}).Push(gtx.Ops).Pop()
paint.Fill(gtx.Ops, backgroundColor)
event.Op(gtx.Ops, t) // area for capturing scroll events
if t.InstrumentEditor.enlargeBtn.Bool.Value() {
t.layoutTop(gtx)
} else {
@ -203,11 +215,20 @@ func (t *Tracker) Layout(gtx layout.Context, w *app.Window) {
key.Filter{Name: "", Optional: key.ModAlt | key.ModCommand | key.ModShift | key.ModShortcut | key.ModSuper},
key.Filter{Name: key.NameTab, Optional: key.ModShift},
transfer.TargetFilter{Target: t, Type: "application/text"},
pointer.Filter{Target: t, Kinds: pointer.Scroll, ScrollY: pointer.ScrollRange{Min: -1, Max: 1}},
)
if !ok {
break
}
switch e := ev.(type) {
case pointer.Event:
switch e.Kind {
case pointer.Scroll:
if e.Modifiers.Contain(key.ModShortcut) {
t.Zoom = min(max(t.Zoom-int(e.Scroll.Y), 0), len(ZoomFactors)-1)
t.Alerts().AddNamed("ZoomFactor", fmt.Sprintf("%.0f%%", ZoomFactors[t.Zoom]*100), tracker.Info)
}
}
case key.Event:
t.KeyEvent(e, gtx)
case transfer.DataEvent: