Skip to content

Fix changes to widget.Form.Items not being reflected on refresh #5308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coder-in-go wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix changes to widget.Form.Items not being reflected on refresh #5308

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd50b90
Resolved bug 1966: Cannot replace FormItem Widget
coder-in-go Dec 11, 2024
f024435
Optimized the fix for the issue: 1966
coder-in-go Dec 13, 2024
30fc273
Added test for the bug fix: 1966
coder-in-go Dec 13, 2024
77640b0
Resolved the comment for the bug fix
coder-in-go Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions widget/form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,27 +256,32 @@ func (f *Form) checkValidation(err error) {
}

func (f *Form) ensureRenderItems() {
done := len(f.itemGrid.Objects) / 2
if done >= len(f.Items) {
f.itemGrid.Objects = f.itemGrid.Objects[0 : len(f.Items)*2]
existingItemCount := len(f.itemGrid.Objects) / 2
if existingItemCount > len(f.Items) {
f.itemGrid.Objects = f.itemGrid.Objects[:len(f.Items)*2]
return
}

adding := len(f.Items) - done
objects := make([]fyne.CanvasObject, adding*2)
off := 0
for i, item := range f.Items {
if i < done {
continue
labelIndex := i * 2
widgetIndex := labelIndex + 1

if labelIndex < len(f.itemGrid.Objects) {
f.itemGrid.Objects[labelIndex] = f.createLabel(item.Text)
} else {
f.itemGrid.Objects = append(f.itemGrid.Objects, f.createLabel(item.Text))
}

objects[off] = f.createLabel(item.Text)
off++
f.setUpValidation(item.Widget, i)
objects[off] = f.createInput(item)
off++
if widgetIndex < len(f.itemGrid.Objects) {
f.setUpValidation(item.Widget, i)
f.itemGrid.Objects[widgetIndex] = item.Widget
} else {
f.setUpValidation(item.Widget, i)
f.itemGrid.Objects = append(f.itemGrid.Objects, item.Widget)
}
}
f.itemGrid.Objects = append(f.itemGrid.Objects, objects...)

f.itemGrid.Refresh()
}

func (f *Form) isVertical() bool {
Expand Down
Loading