Stu Leak
68df790d27
Major improvements to UnifiedPlayer: 1. GetFrameImage() now works when paused for responsive UI updates 2. Play() method properly starts FFmpeg process 3. Frame display loop runs continuously for smooth video display 4. Disabled audio temporarily to fix video playback fundamentals 5. Simplified FFmpeg command to focus on video stream only Player now: - Generates video frames correctly - Shows video when paused - Has responsive progress tracking - Starts playback properly Next steps: Re-enable audio playback once video is stable
109 lines
3.9 KiB
Go
109 lines
3.9 KiB
Go
package layout
|
|
|
|
import (
|
|
"fyne.io/fyne/v2"
|
|
"fyne.io/fyne/v2/theme"
|
|
)
|
|
|
|
// Declare conformity with Layout interface
|
|
var _ fyne.Layout = (*borderLayout)(nil)
|
|
|
|
type borderLayout struct {
|
|
top, bottom, left, right fyne.CanvasObject
|
|
}
|
|
|
|
// NewBorderLayout creates a new BorderLayout instance with top, bottom, left
|
|
// and right objects set. All other items in the container will fill the remaining space in the middle.
|
|
// Multiple extra items will be stacked in the specified order as a Stack container.
|
|
func NewBorderLayout(top, bottom, left, right fyne.CanvasObject) fyne.Layout {
|
|
return &borderLayout{top, bottom, left, right}
|
|
}
|
|
|
|
// Layout is called to pack all child objects into a specified size.
|
|
// For BorderLayout this arranges the top, bottom, left and right widgets at
|
|
// the sides and any remaining widgets are maximised in the middle space.
|
|
func (b *borderLayout) Layout(objects []fyne.CanvasObject, size fyne.Size) {
|
|
padding := theme.Padding()
|
|
var topSize, bottomSize, leftSize, rightSize fyne.Size
|
|
if b.top != nil && b.top.Visible() {
|
|
topHeight := b.top.MinSize().Height
|
|
b.top.Resize(fyne.NewSize(size.Width, topHeight))
|
|
b.top.Move(fyne.NewPos(0, 0))
|
|
topSize = fyne.NewSize(size.Width, topHeight+padding)
|
|
}
|
|
if b.bottom != nil && b.bottom.Visible() {
|
|
bottomHeight := b.bottom.MinSize().Height
|
|
b.bottom.Resize(fyne.NewSize(size.Width, bottomHeight))
|
|
b.bottom.Move(fyne.NewPos(0, size.Height-bottomHeight))
|
|
bottomSize = fyne.NewSize(size.Width, bottomHeight+padding)
|
|
}
|
|
if b.left != nil && b.left.Visible() {
|
|
leftWidth := b.left.MinSize().Width
|
|
b.left.Resize(fyne.NewSize(leftWidth, size.Height-topSize.Height-bottomSize.Height))
|
|
b.left.Move(fyne.NewPos(0, topSize.Height))
|
|
leftSize = fyne.NewSize(leftWidth+padding, size.Height-topSize.Height-bottomSize.Height)
|
|
}
|
|
if b.right != nil && b.right.Visible() {
|
|
rightWidth := b.right.MinSize().Width
|
|
b.right.Resize(fyne.NewSize(rightWidth, size.Height-topSize.Height-bottomSize.Height))
|
|
b.right.Move(fyne.NewPos(size.Width-rightWidth, topSize.Height))
|
|
rightSize = fyne.NewSize(rightWidth+padding, size.Height-topSize.Height-bottomSize.Height)
|
|
}
|
|
|
|
middleSize := fyne.NewSize(size.Width-leftSize.Width-rightSize.Width, size.Height-topSize.Height-bottomSize.Height)
|
|
middlePos := fyne.NewPos(leftSize.Width, topSize.Height)
|
|
for _, child := range objects {
|
|
if !child.Visible() {
|
|
continue
|
|
}
|
|
|
|
if child != b.top && child != b.bottom && child != b.left && child != b.right {
|
|
child.Resize(middleSize)
|
|
child.Move(middlePos)
|
|
}
|
|
}
|
|
}
|
|
|
|
// MinSize finds the smallest size that satisfies all the child objects.
|
|
// For BorderLayout this is determined by the MinSize height of the top and
|
|
// plus the MinSize width of the left and right, plus any padding needed.
|
|
// This is then added to the union of the MinSize for any remaining content.
|
|
func (b *borderLayout) MinSize(objects []fyne.CanvasObject) fyne.Size {
|
|
minSize := fyne.NewSize(0, 0)
|
|
for _, child := range objects {
|
|
if !child.Visible() {
|
|
continue
|
|
}
|
|
|
|
if child != b.top && child != b.bottom && child != b.left && child != b.right {
|
|
minSize = minSize.Max(child.MinSize())
|
|
}
|
|
}
|
|
|
|
padding := theme.Padding()
|
|
|
|
if b.left != nil && b.left.Visible() {
|
|
leftMin := b.left.MinSize()
|
|
minHeight := fyne.Max(minSize.Height, leftMin.Height)
|
|
minSize = fyne.NewSize(minSize.Width+leftMin.Width+padding, minHeight)
|
|
}
|
|
if b.right != nil && b.right.Visible() {
|
|
rightMin := b.right.MinSize()
|
|
minHeight := fyne.Max(minSize.Height, rightMin.Height)
|
|
minSize = fyne.NewSize(minSize.Width+rightMin.Width+padding, minHeight)
|
|
}
|
|
|
|
if b.top != nil && b.top.Visible() {
|
|
topMin := b.top.MinSize()
|
|
minWidth := fyne.Max(minSize.Width, topMin.Width)
|
|
minSize = fyne.NewSize(minWidth, minSize.Height+topMin.Height+padding)
|
|
}
|
|
if b.bottom != nil && b.bottom.Visible() {
|
|
bottomMin := b.bottom.MinSize()
|
|
minWidth := fyne.Max(minSize.Width, bottomMin.Width)
|
|
minSize = fyne.NewSize(minWidth, minSize.Height+bottomMin.Height+padding)
|
|
}
|
|
|
|
return minSize
|
|
}
|