Compare commits

..

No commits in common. "ccd75af9367b6ec694e7caf294c6f3e64f3ad95f" and "a1678cf150ed1c459bd345459d3a920f36a14929" have entirely different histories.

36
main.go
View File

@ -114,16 +114,9 @@ func statusStrip(bar *ui.ConversionStatsBar) fyne.CanvasObject {
return container.NewMax(bg, content)
}
// moduleFooter stacks a dark status strip above a tinted action/footer band.
// If content is nil, a spacer is used for consistent height/color.
func moduleFooter(tint color.Color, content fyne.CanvasObject, bar *ui.ConversionStatsBar) fyne.CanvasObject {
if content == nil {
content = layout.NewSpacer()
}
bg := canvas.NewRectangle(tint)
bg.SetMinSize(fyne.NewSize(0, 44))
tinted := container.NewMax(bg, container.NewPadded(content))
return container.NewVBox(statusStrip(bar), tinted)
// moduleFooter renders only the dark status strip for consistency across modules.
func moduleFooter(_ color.Color, _ fyne.CanvasObject, bar *ui.ConversionStatsBar) fyne.CanvasObject {
return statusStrip(bar)
}
// resolveTargetAspect resolves an aspect ratio value or source aspect
@ -5918,8 +5911,10 @@ func buildConvertView(state *appState, src *videoSource) fyne.CanvasObject {
})
leftControls := container.NewHBox(resetBtn, loadCfgBtn, saveCfgBtn, autoCompareCheck)
centerStatus := container.NewHBox(activity, statusLabel)
rightControls := container.NewHBox(cancelBtn, cancelQueueBtn, viewLogBtn, addQueueBtn, convertBtn)
actionBar := container.NewHBox(leftControls, layout.NewSpacer(), rightControls)
actionInner := container.NewBorder(nil, nil, leftControls, rightControls, centerStatus)
actionBar := ui.TintedBar(convertColor, actionInner)
// Start a UI refresh ticker to update widgets from state while conversion is active
// This ensures progress updates even when navigating between modules
@ -5998,17 +5993,16 @@ func buildConvertView(state *appState, src *videoSource) fyne.CanvasObject {
scrollableMain := container.NewVScroll(mainContent)
mainWithFooter := container.NewBorder(
nil,
container.NewVBox(
snippetConfigRow,
snippetRow,
widget.NewSeparator(),
),
nil, nil,
container.NewMax(scrollableMain),
footerContent := container.NewVBox(
snippetConfigRow,
snippetRow,
widget.NewSeparator(),
actionBar,
)
return container.NewBorder(backBar, moduleFooter(convertColor, actionBar, state.statsBar), nil, nil, mainWithFooter)
// Actions/snippets stay above; footer is a single dark status strip
mainWithFooter := container.NewBorder(nil, footerContent, nil, nil, container.NewMax(scrollableMain))
return container.NewBorder(backBar, statusStrip(state.statsBar), nil, nil, mainWithFooter)
}