joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 09:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

apps/gophers: larger font sizes and a layout fix

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-11 16:56:56 +02:00
parent bcd5685e78
commit 431fa218b2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/go.mod
+1 -1
View File
@@ -3,7 +3,7 @@ module gioui.org/apps
go 1.12 go 1.12
require ( require (
gioui.org/ui v0.0.0-20190711123338-478d56102a83 gioui.org/ui v0.0.0-20190711133118-bcd5685e78c6
github.com/google/go-github/v24 v24.0.1 github.com/google/go-github/v24 v24.0.1
golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9 golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9
apps/gophers/main.go
+7 -7
View File
@@ -273,7 +273,7 @@ func newApp(w *app.Window) *App {
a.fab = &ActionButton{ a.fab = &ActionButton{
config: &a.cfg, config: &a.cfg,
inputs: a.inputs, inputs: a.inputs,
face: a.face(fonts.regular, 9), face: a.face(fonts.regular, 11),
sendIco: &icon{src: icons.ContentSend, size: ui.Dp(24)}, sendIco: &icon{src: icons.ContentSend, size: ui.Dp(24)},
icons: []*icon{}, icons: []*icon{},
} }
@@ -291,7 +291,7 @@ func newApp(w *app.Window) *App {
a.edit = &text.Editor{ a.edit = &text.Editor{
Config: &a.cfg, Config: &a.cfg,
Inputs: a.inputs, Inputs: a.inputs,
Face: a.face(fonts.regular, 14), Face: a.face(fonts.regular, 16),
Material: theme.text, Material: theme.text,
//Alignment: text.End, //Alignment: text.End,
//SingleLine: true, //SingleLine: true,
@@ -526,7 +526,7 @@ func (a *App) layoutUsers(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
cs = s.Rigid() cs = s.Rigid()
in := layout.Insets{Top: ui.Dp(16), Right: ui.Dp(8), Bottom: ui.Dp(8), Left: ui.Dp(8)} in := layout.Insets{Top: ui.Dp(16), Right: ui.Dp(8), Bottom: ui.Dp(8), Left: ui.Dp(8)}
grey := colorMaterial(ops, rgb(0x888888)) grey := colorMaterial(ops, rgb(0x888888))
lbl := text.Label{Material: grey, Face: a.face(fonts.regular, 9), Text: "GOPHERS"} lbl := text.Label{Material: grey, Face: a.face(fonts.regular, 11), Text: "GOPHERS"}
dims = in.End(lbl.Layout(ops, in.Begin(c, ops, cs))) dims = in.End(lbl.Layout(ops, in.Begin(c, ops, cs)))
c2 := s.End(dims) c2 := s.End(dims)
c1 := s.End(fill{colorMaterial(ops, rgb(0xf2f2f2))}.Layout(ops, s.Expand())) c1 := s.End(fill{colorMaterial(ops, rgb(0xf2f2f2))}.Layout(ops, s.Expand()))
@@ -613,13 +613,13 @@ func (a *App) user(ops *ui.Ops, cs layout.Constraints, c ui.Config, index int) l
f := baseline() f := baseline()
f.Init(ops, cs) f.Init(ops, cs)
cs = f.Rigid() cs = f.Rigid()
dims = text.Label{Material: theme.text, Face: a.face(fonts.regular, 11), Text: u.name}.Layout(ops, cs) dims = text.Label{Material: theme.text, Face: a.face(fonts.regular, 13), Text: u.name}.Layout(ops, cs)
c1 := f.End(dims) c1 := f.End(dims)
cs = f.Rigid() cs = f.Flexible(1, layout.Fit)
al := layout.Align{Alignment: layout.E} al := layout.Align{Alignment: layout.E}
in := layout.Insets{Left: ui.Dp(2)} in := layout.Insets{Left: ui.Dp(2)}
cs = in.Begin(c, ops, al.Begin(ops, cs)) cs = in.Begin(c, ops, al.Begin(ops, cs))
dims = text.Label{Material: theme.text, Face: a.face(fonts.regular, 8), Text: "3 hours ago"}.Layout(ops, cs) dims = text.Label{Material: theme.text, Face: a.face(fonts.regular, 10), Text: "3 hours ago"}.Layout(ops, cs)
dims = al.End(in.End(dims)) dims = al.End(in.End(dims))
c2 := f.End(dims) c2 := f.End(dims)
dims = f.Layout(c1, c2) dims = f.Layout(c1, c2)
@@ -628,7 +628,7 @@ func (a *App) user(ops *ui.Ops, cs layout.Constraints, c ui.Config, index int) l
cs = f.Rigid() cs = f.Rigid()
in := layout.Insets{Top: ui.Dp(4)} in := layout.Insets{Top: ui.Dp(4)}
cs = in.Begin(c, ops, cs) cs = in.Begin(c, ops, cs)
dims = text.Label{Material: theme.tertText, Face: a.face(fonts.regular, 10), Text: u.company}.Layout(ops, cs) dims = text.Label{Material: theme.tertText, Face: a.face(fonts.regular, 12), Text: u.company}.Layout(ops, cs)
dims = in.End(dims) dims = in.End(dims)
c2 := f.End(dims) c2 := f.End(dims)
dims = f.Layout(c1, c2) dims = f.Layout(c1, c2)