Skip to content
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

Jump to bottom

Ensure Popups are resized in newly created window and when window is resized, fixes #1692 #1932

Merged
merged 9 commits into from Feb 26, 2021
Merged

Ensure Popups are resized in newly created window and when window is resized, fixes #1692 #1932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a7abe93
fix file dialog resize method, ensure popup overlays are refreshed wh…
fpabl0 Feb 9, 2021
8f5a784
Merge branch 'develop' into fix/1692
fpabl0 Feb 23, 2021
19a2371
remove commented out code
fpabl0 Feb 23, 2021
06fea41
remove unnecessary logic in popup.Resize
fpabl0 Feb 23, 2021
5a57d10
remove logic in dialog.Resize that is already delegated to widget.PopUp
fpabl0 Feb 23, 2021
e8d6f92
remove logic in baseDialog.Resize that is already delegated to widget…
fpabl0 Feb 24, 2021
f5bee90
changes applied to mobileDriver too, removed unnecessary popup refres…
fpabl0 Feb 24, 2021
6c71bf5
added canvas tests for desktop and mobile
fpabl0 Feb 24, 2021
0cbe434
ensure testcanvas mimics real canvas.Resize behavior, remove conflict…
fpabl0 Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 16 additions & 14 deletions dialog/file.go
View file
Open in desktop
Expand Up @@ -476,21 +476,23 @@ func (f *FileDialog) Resize(size fyne.Size) {
if f.dialog == nil {
return
}
maxSize := f.dialog.win.Size()
minSize := f.dialog.win.MinSize()
newWidth := size.Width
if size.Width > maxSize.Width {
newWidth = maxSize.Width
} else if size.Width < minSize.Width {
newWidth = minSize.Width
}
newHeight := size.Height
if size.Height > maxSize.Height {
newHeight = maxSize.Height
} else if size.Height < minSize.Height {
newHeight = minSize.Height
}
f.dialog.win.Resize(fyne.NewSize(newWidth, newHeight))
f.dialog.win.Resize(minSize.Max(size))
// maxSize := f.dialog.win.Size()
fpabl0 marked this conversation as resolved.
Show resolved Hide resolved
// minSize := f.dialog.win.MinSize()
// newWidth := size.Width
// if size.Width > maxSize.Width {
// newWidth = maxSize.Width
// } else if size.Width < minSize.Width {
// newWidth = minSize.Width
// }
// newHeight := size.Height
// if size.Height > maxSize.Height {
// newHeight = maxSize.Height
// } else if size.Height < minSize.Height {
// newHeight = minSize.Height
// }
// f.dialog.win.Resize(fyne.NewSize(newWidth, newHeight))
}

// Hide hides the file dialog.
Expand Down
3 changes: 2 additions & 1 deletion internal/driver/glfw/canvas.go
View file
Open in desktop
Expand Up @@ -178,7 +178,8 @@ func (c *glCanvas) Resize(size fyne.Size) {
if p, ok := overlay.(*widget.PopUp); ok {
// TODO: remove this when #707 is being addressed.
// “Notifies” the PopUp of the canvas size change.
p.Resize(p.Content.Size().Add(fyne.NewSize(theme.Padding()*2, theme.Padding()*2)))
// fmt.Printf("%#v ,canvas resize: %v\n", p, p.Content.Size())
p.Refresh()
} else {
overlay.Resize(size)
}
Expand Down
8 changes: 8 additions & 0 deletions internal/driver/glfw/window.go
View file
Open in desktop
Expand Up @@ -402,6 +402,14 @@ func (w *window) doShow() {
if w.canvas.Content() != nil {
w.canvas.Content().Show()
}

// Refresh popup overlays
for _, overlay := range w.canvas.Overlays().List() {
if _, ok := overlay.(*widget.PopUp); !ok {
continue
}
overlay.Refresh()
}
}

func (w *window) Hide() {
Expand Down
4 changes: 3 additions & 1 deletion widget/popup.go
View file
Open in desktop
Expand Up @@ -47,8 +47,10 @@ func (p *PopUp) Move(pos fyne.Position) {
//
// Implements: fyne.Widget
func (p *PopUp) Resize(size fyne.Size) {
canvasSize := p.Canvas.Size()
p.innerSize = size
p.BaseWidget.Resize(p.Canvas.Size())
p.Content.Resize(p.innerSize.Subtract(fyne.NewSize(theme.Padding()*2, theme.Padding()*2)))
p.BaseWidget.Resize(canvasSize)
// The canvas size might not have changed and therefore the Resize won't trigger a layout.
// Until we have a widget.Relayout() or similar, the renderer's refresh will do the re-layout.
p.Refresh()
Expand Down