|
9 | 9 | "gioui.org/unit"
|
10 | 10 | "gioui.org/widget"
|
11 | 11 | "github.com/vsariola/sointu/tracker"
|
| 12 | + "github.com/vsariola/sointu/version" |
12 | 13 | "golang.org/x/exp/shiny/materialdesign/icons"
|
13 | 14 | )
|
14 | 15 |
|
@@ -92,7 +93,7 @@ func (t *SongPanel) layoutMenuBar(gtx C, tr *Tracker) D {
|
92 | 93 | gtx.Constraints.Max.Y = gtx.Dp(unit.Dp(36))
|
93 | 94 | gtx.Constraints.Min.Y = gtx.Dp(unit.Dp(36))
|
94 | 95 |
|
95 |
| - return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, |
| 96 | + return layout.Flex{Axis: layout.Horizontal, Alignment: layout.End}.Layout(gtx, |
96 | 97 | layout.Rigid(tr.layoutMenu(gtx, "File", &t.MenuBar[0], &t.Menus[0], unit.Dp(200), t.fileMenuItems...)),
|
97 | 98 | layout.Rigid(tr.layoutMenu(gtx, "Edit", &t.MenuBar[1], &t.Menus[1], unit.Dp(200), t.editMenuItems...)),
|
98 | 99 | )
|
@@ -181,5 +182,10 @@ func (t *SongPanel) layoutSongOptions(gtx C, tr *Tracker) D {
|
181 | 182 | )
|
182 | 183 | }),
|
183 | 184 | layout.Rigid(panicBtnStyle.Layout),
|
| 185 | + layout.Flexed(1, func(gtx C) D { return layout.Dimensions{Size: gtx.Constraints.Min} }), |
| 186 | + layout.Rigid(func(gtx C) D { |
| 187 | + labelStyle := LabelStyle{Text: version.VersionOrHash, FontSize: unit.Sp(12), Color: mediumEmphasisTextColor, Shaper: tr.Theme.Shaper} |
| 188 | + return labelStyle.Layout(gtx) |
| 189 | + }), |
184 | 190 | )
|
185 | 191 | }
|
0 commit comments