Skip to content

Commit 3229da5

Browse files
andydotxyzandydotxyz
committed
Remove prefix for context
1 parent f519156 commit 3229da5

File tree

9 files changed

+157
-157
lines changed

9 files changed

+157
-157
lines changed

‎context.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import (
77
"github.com/fyne-io/refyne/internal/guidefs"
88
)
99

10-
type DefyneContext = guidefs.DefyneContext
10+
type Context = guidefs.Context
1111

1212
type context struct {
1313
meta map[fyne.CanvasObject]map[string]string
1414
}
1515

1616
// DefaultContext returns a simple context with an empty metadata map that will
1717
// defer to the default theme for theming information.
18-
func DefaultContext() DefyneContext {
18+
func DefaultContext() Context {
1919
return &context{meta: make(map[fyne.CanvasObject]map[string]string)}
2020
}
2121

‎edit.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
// CreateNew returns a new instance of the given widget type
13-
func CreateNew(name string, d DefyneContext) fyne.CanvasObject {
13+
func CreateNew(name string, d Context) fyne.CanvasObject {
1414
guidefs.InitOnce()
1515

1616
if match := guidefs.Lookup(name); match != nil {
@@ -22,7 +22,7 @@ func CreateNew(name string, d DefyneContext) fyne.CanvasObject {
2222

2323
// EditorFor returns an array of FormItems for editing, taking the widget, properties, callback to refresh the form items,
2424
// and an optional callback that fires after changes to the widget.
25-
func EditorFor(o fyne.CanvasObject, d DefyneContext, refresh func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
25+
func EditorFor(o fyne.CanvasObject, d Context, refresh func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
2626
guidefs.InitOnce()
2727

2828
_, clazz := getTypeOf(o)
@@ -39,7 +39,7 @@ func EditorFor(o fyne.CanvasObject, d DefyneContext, refresh func([]*widget.Form
3939
}
4040

4141
// GoStringFor generates the Go code for the given widget
42-
func GoStringFor(o fyne.CanvasObject, d DefyneContext, defs map[string]string) string {
42+
func GoStringFor(o fyne.CanvasObject, d Context, defs map[string]string) string {
4343
guidefs.InitOnce()
4444

4545
name := reflect.TypeOf(o).String()

‎go.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
// ExportGo generates a full Go package for the given object and writes it to the provided file handle
17-
func ExportGo(obj fyne.CanvasObject, d DefyneContext, name string, w io.Writer) error {
17+
func ExportGo(obj fyne.CanvasObject, d Context, name string, w io.Writer) error {
1818
guidefs.InitOnce()
1919

2020
packagesList := packagesRequired(obj, d)
@@ -31,7 +31,7 @@ func ExportGo(obj fyne.CanvasObject, d DefyneContext, name string, w io.Writer)
3131
}
3232

3333
// ExportGoPreview generates a preview version of the Go code with a `main()` method for the given object and writes it to the file handle
34-
func ExportGoPreview(obj fyne.CanvasObject, d DefyneContext, w io.Writer) error {
34+
func ExportGoPreview(obj fyne.CanvasObject, d Context, w io.Writer) error {
3535
guidefs.InitOnce()
3636

3737
packagesList := packagesRequired(obj, d)
@@ -59,7 +59,7 @@ func main() {
5959
return err
6060
}
6161

62-
func exportCode(pkgs, vars []string, obj fyne.CanvasObject, d DefyneContext, name string) string {
62+
func exportCode(pkgs, vars []string, obj fyne.CanvasObject, d Context, name string) string {
6363
for i := 0; i < len(pkgs); i++ {
6464
if pkgs[i] != "fmt" && pkgs[i] != "net/url" && pkgs[i] != "image/color" {
6565
pkgs[i] = "fyne.io/fyne/v2/" + pkgs[i]
@@ -132,7 +132,7 @@ func (g *%s) makeUI() fyne.CanvasObject {
132132
return string(formatted)
133133
}
134134

135-
func packagesRequired(obj fyne.CanvasObject, d DefyneContext) []string {
135+
func packagesRequired(obj fyne.CanvasObject, d Context) []string {
136136
ret := []string{"container"}
137137
var objs []fyne.CanvasObject
138138
if c, ok := obj.(*fyne.Container); ok {
@@ -170,7 +170,7 @@ func packagesRequired(obj fyne.CanvasObject, d DefyneContext) []string {
170170
return ret
171171
}
172172

173-
func packagesRequiredForWidget(w fyne.CanvasObject, d DefyneContext) []string {
173+
func packagesRequiredForWidget(w fyne.CanvasObject, d Context) []string {
174174
name := reflect.TypeOf(w).String()
175175
if pkgs := guidefs.Lookup(name).Packages; pkgs != nil {
176176
return pkgs(w, d)
@@ -183,7 +183,7 @@ func packagesRequiredForWidget(w fyne.CanvasObject, d DefyneContext) []string {
183183
return []string{}
184184
}
185185

186-
func varsRequired(obj fyne.CanvasObject, d DefyneContext) (widgets, containers []string) {
186+
func varsRequired(obj fyne.CanvasObject, d Context) (widgets, containers []string) {
187187
name := d.Metadata()[obj]["name"]
188188

189189
if c, ok := obj.(*fyne.Container); ok {

‎internal/guidefs/containers.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ func initContainers() {
1616
Containers = map[string]WidgetInfo{
1717
"*fyne.Container": {
1818
Name: "Container",
19-
Create: func(DefyneContext) fyne.CanvasObject {
19+
Create: func(Context) fyne.CanvasObject {
2020
return container.NewVBox()
2121
},
22-
Edit: func(obj fyne.CanvasObject, ctx DefyneContext, refresh func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
22+
Edit: func(obj fyne.CanvasObject, ctx Context, refresh func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
2323
props := ctx.Metadata()[obj]
2424
c := obj.(*fyne.Container)
2525

@@ -47,7 +47,7 @@ func initContainers() {
4747
ready = true
4848
return items
4949
},
50-
Gostring: func(obj fyne.CanvasObject, ctx DefyneContext, defs map[string]string) string {
50+
Gostring: func(obj fyne.CanvasObject, ctx Context, defs map[string]string) string {
5151
props := ctx.Metadata()
5252
c := obj.(*fyne.Container)
5353
l := props[c]["layout"]
@@ -88,10 +88,10 @@ func initContainers() {
8888
item := container.NewTabItem("Untitled", o)
8989
tabs.Append(item)
9090
},
91-
Create: func(DefyneContext) fyne.CanvasObject {
91+
Create: func(Context) fyne.CanvasObject {
9292
return container.NewAppTabs(container.NewTabItem("Untitled", container.NewStack()))
9393
},
94-
Edit: func(obj fyne.CanvasObject, _ DefyneContext, setItems func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
94+
Edit: func(obj fyne.CanvasObject, _ Context, setItems func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
9595
tabs := obj.(*container.AppTabs)
9696
items := make([]*widget.FormItem, len(tabs.Items)+2)
9797
itemNames := make([]string, len(tabs.Items))
@@ -161,7 +161,7 @@ func initContainers() {
161161
items[len(items)-1] = widget.NewFormItem("Selected", selected)
162162
return items
163163
},
164-
Gostring: func(obj fyne.CanvasObject, ctx DefyneContext, defs map[string]string) string {
164+
Gostring: func(obj fyne.CanvasObject, ctx Context, defs map[string]string) string {
165165
props := ctx.Metadata()
166166
tabs := obj.(*container.AppTabs)
167167
str := &strings.Builder{}
@@ -187,7 +187,7 @@ func initContainers() {
187187
str.WriteString(")")
188188
return widgetRef(props[obj], defs, str.String())
189189
},
190-
Packages: func(obj fyne.CanvasObject, _ DefyneContext) []string {
190+
Packages: func(obj fyne.CanvasObject, _ Context) []string {
191191
tabs := obj.(*container.AppTabs)
192192
for _, c := range tabs.Items {
193193
if c.Icon != nil {
@@ -208,10 +208,10 @@ func initContainers() {
208208
scr.Content = o
209209
scr.Refresh()
210210
},
211-
Create: func(DefyneContext) fyne.CanvasObject {
211+
Create: func(Context) fyne.CanvasObject {
212212
return container.NewScroll(container.NewStack())
213213
},
214-
Edit: func(obj fyne.CanvasObject, c DefyneContext, _ func([]*widget.FormItem), _ func()) []*widget.FormItem {
214+
Edit: func(obj fyne.CanvasObject, c Context, _ func([]*widget.FormItem), _ func()) []*widget.FormItem {
215215
scroll := obj.(*container.Scroll)
216216
dirVert := widget.NewCheck("", func(on bool) {
217217
isHorizontal := scroll.Direction == container.ScrollBoth || scroll.Direction == container.ScrollHorizontalOnly
@@ -256,7 +256,7 @@ func initContainers() {
256256
widget.NewFormItem("Scroll Horizontal", dirHoriz),
257257
}
258258
},
259-
Gostring: func(obj fyne.CanvasObject, c DefyneContext, defs map[string]string) string {
259+
Gostring: func(obj fyne.CanvasObject, c Context, defs map[string]string) string {
260260
props := c.Metadata()
261261
s := obj.(*container.Scroll)
262262
str := &strings.Builder{}
@@ -273,7 +273,7 @@ func initContainers() {
273273

274274
return widgetRef(props[obj], defs, str.String())
275275
},
276-
Packages: func(_ fyne.CanvasObject, _ DefyneContext) []string {
276+
Packages: func(_ fyne.CanvasObject, _ Context) []string {
277277
return []string{"container"}
278278
},
279279
},
@@ -292,10 +292,10 @@ func initContainers() {
292292
}
293293
split.Refresh()
294294
},
295-
Create: func(DefyneContext) fyne.CanvasObject {
295+
Create: func(Context) fyne.CanvasObject {
296296
return container.NewHSplit(container.NewStack(), container.NewStack())
297297
},
298-
Edit: func(obj fyne.CanvasObject, c DefyneContext, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
298+
Edit: func(obj fyne.CanvasObject, c Context, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
299299
split := obj.(*container.Split)
300300
offset := widget.NewEntry()
301301
offset.SetText(fmt.Sprintf("%f", split.Offset))
@@ -317,7 +317,7 @@ func initContainers() {
317317
widget.NewFormItem("Vertical", vert),
318318
}
319319
},
320-
Gostring: func(obj fyne.CanvasObject, c DefyneContext, defs map[string]string) string {
320+
Gostring: func(obj fyne.CanvasObject, c Context, defs map[string]string) string {
321321
props := c.Metadata()
322322
s := obj.(*container.Split)
323323
str := &strings.Builder{}
@@ -328,7 +328,7 @@ func initContainers() {
328328
str.WriteString("}")
329329
return widgetRef(props[obj], defs, str.String())
330330
},
331-
Packages: func(_ fyne.CanvasObject, _ DefyneContext) []string {
331+
Packages: func(_ fyne.CanvasObject, _ Context) []string {
332332
return []string{"container"}
333333
},
334334
},
@@ -343,10 +343,10 @@ func initContainers() {
343343
over.Content = o
344344
over.Refresh()
345345
},
346-
Create: func(c DefyneContext) fyne.CanvasObject {
346+
Create: func(c Context) fyne.CanvasObject {
347347
return container.NewThemeOverride(container.NewStack(), c.Theme())
348348
},
349-
Edit: func(obj fyne.CanvasObject, c DefyneContext, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
349+
Edit: func(obj fyne.CanvasObject, c Context, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
350350
props := c.Metadata()[obj]
351351
over := obj.(*container.ThemeOverride)
352352
custom := widget.NewMultiLineEntry()
@@ -367,7 +367,7 @@ func initContainers() {
367367
widget.NewFormItem("Theme Data", custom),
368368
}
369369
},
370-
Gostring: func(obj fyne.CanvasObject, c DefyneContext, defs map[string]string) string {
370+
Gostring: func(obj fyne.CanvasObject, c Context, defs map[string]string) string {
371371
props := c.Metadata()[obj]
372372
over := obj.(*container.ThemeOverride)
373373
str := &strings.Builder{}
@@ -379,7 +379,7 @@ func initContainers() {
379379
str.WriteString("`, fyne.CurrentApp().Settings().Theme()); return th}())")
380380
return widgetRef(props, defs, str.String())
381381
},
382-
Packages: func(_ fyne.CanvasObject, _ DefyneContext) []string {
382+
Packages: func(_ fyne.CanvasObject, _ Context) []string {
383383
return []string{"container", "theme"}
384384
},
385385
},

‎internal/guidefs/go.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
// GoString generates Go code for the given type and object
12-
func GoString(clazz string, obj fyne.CanvasObject, c DefyneContext, defs map[string]string) string {
12+
func GoString(clazz string, obj fyne.CanvasObject, c Context, defs map[string]string) string {
1313
info := Lookup(clazz)
1414
if info == nil {
1515
return ""

‎internal/guidefs/graphics.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ func initGraphics() {
2424
Graphics = map[string]WidgetInfo{
2525
"*canvas.Circle": {
2626
Name: "Circle",
27-
Create: func(DefyneContext) fyne.CanvasObject {
27+
Create: func(Context) fyne.CanvasObject {
2828
rect := canvas.NewCircle(color.Black)
2929
rect.StrokeColor = color.Black
3030
return rect
3131
},
32-
Edit: func(obj fyne.CanvasObject, _ DefyneContext, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
32+
Edit: func(obj fyne.CanvasObject, _ Context, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
3333
r := obj.(*canvas.Circle)
3434
return []*widget.FormItem{
3535
widget.NewFormItem("Fill", newColorButton(r.FillColor, func(c color.Color) {
@@ -49,16 +49,16 @@ func initGraphics() {
4949
})),
5050
}
5151
},
52-
Packages: func(_ fyne.CanvasObject, _ DefyneContext) []string {
52+
Packages: func(_ fyne.CanvasObject, _ Context) []string {
5353
return []string{"canvas", "image/color"}
5454
},
5555
},
5656
"*canvas.LinearGradient": {
5757
Name: "LinearGradient",
58-
Create: func(DefyneContext) fyne.CanvasObject {
58+
Create: func(Context) fyne.CanvasObject {
5959
return &canvas.LinearGradient{StartColor: color.White}
6060
},
61-
Edit: func(obj fyne.CanvasObject, _ DefyneContext, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
61+
Edit: func(obj fyne.CanvasObject, _ Context, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
6262
r := obj.(*canvas.LinearGradient)
6363
angleSlide := widget.NewSlider(0, 360)
6464
angleSlide.Step = 90
@@ -81,16 +81,16 @@ func initGraphics() {
8181
widget.NewFormItem("Angle", angleSlide),
8282
}
8383
},
84-
Packages: func(_ fyne.CanvasObject, _ DefyneContext) []string {
84+
Packages: func(_ fyne.CanvasObject, _ Context) []string {
8585
return []string{"canvas", "image/color"}
8686
},
8787
},
8888
"*canvas.RadialGradient": {
8989
Name: "RadialGradient",
90-
Create: func(DefyneContext) fyne.CanvasObject {
90+
Create: func(Context) fyne.CanvasObject {
9191
return &canvas.RadialGradient{StartColor: color.White}
9292
},
93-
Edit: func(obj fyne.CanvasObject, _ DefyneContext, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
93+
Edit: func(obj fyne.CanvasObject, _ Context, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
9494
r := obj.(*canvas.RadialGradient)
9595
return []*widget.FormItem{
9696
widget.NewFormItem("Start", newColorButton(r.StartColor, func(c color.Color) {
@@ -105,18 +105,18 @@ func initGraphics() {
105105
})),
106106
}
107107
},
108-
Packages: func(_ fyne.CanvasObject, _ DefyneContext) []string {
108+
Packages: func(_ fyne.CanvasObject, _ Context) []string {
109109
return []string{"canvas", "image/color"}
110110
},
111111
},
112112
"*canvas.Rectangle": {
113113
Name: "Rectangle",
114-
Create: func(DefyneContext) fyne.CanvasObject {
114+
Create: func(Context) fyne.CanvasObject {
115115
rect := canvas.NewRectangle(color.Black)
116116
rect.StrokeColor = color.Black
117117
return rect
118118
},
119-
Edit: func(obj fyne.CanvasObject, _ DefyneContext, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
119+
Edit: func(obj fyne.CanvasObject, _ Context, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
120120
r := obj.(*canvas.Rectangle)
121121
return []*widget.FormItem{
122122
widget.NewFormItem("Fill", newColorButton(r.FillColor, func(c color.Color) {
@@ -141,17 +141,17 @@ func initGraphics() {
141141
})),
142142
}
143143
},
144-
Packages: func(_ fyne.CanvasObject, _ DefyneContext) []string {
144+
Packages: func(_ fyne.CanvasObject, _ Context) []string {
145145
return []string{"canvas", "image/color"}
146146
},
147147
},
148148
"*canvas.Text": {
149149
Name: "Text",
150-
Create: func(DefyneContext) fyne.CanvasObject {
150+
Create: func(Context) fyne.CanvasObject {
151151
rect := canvas.NewText("Text", color.Black)
152152
return rect
153153
},
154-
Edit: func(obj fyne.CanvasObject, _ DefyneContext, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
154+
Edit: func(obj fyne.CanvasObject, _ Context, _ func([]*widget.FormItem), onchanged func()) []*widget.FormItem {
155155
t := obj.(*canvas.Text)
156156
e := widget.NewEntry()
157157
e.SetText(t.Text)
@@ -197,7 +197,7 @@ func initGraphics() {
197197
widget.NewFormItem("Monospace", mono),
198198
}
199199
},
200-
Packages: func(_ fyne.CanvasObject, _ DefyneContext) []string {
200+
Packages: func(_ fyne.CanvasObject, _ Context) []string {
201201
return []string{"canvas", "image/color"}
202202
},
203203
},

0 commit comments

Comments
 (0)