From dea6d261ad7e360ec997098818b36cfaee0c47c4 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 25 Apr 2021 14:52:42 +1000 Subject: [PATCH] Ensure min/max window sizes are valid --- v2/pkg/options/options.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/v2/pkg/options/options.go b/v2/pkg/options/options.go index d921d2536..40c87b119 100644 --- a/v2/pkg/options/options.go +++ b/v2/pkg/options/options.go @@ -45,6 +45,28 @@ func MergeDefaults(appoptions *App) { log.Fatal(err) } + // Ensure max and min are valid + if appoptions.MinWidth > appoptions.MaxWidth { + appoptions.MinWidth = appoptions.MaxWidth + } + if appoptions.MinHeight > appoptions.MaxHeight { + appoptions.MinHeight = appoptions.MaxHeight + } + + // Ensure width and height are limited if max/min is set + if appoptions.Width < appoptions.MinWidth { + appoptions.Width = appoptions.MinWidth + } + if appoptions.Width > appoptions.MaxWidth { + appoptions.Width = appoptions.MaxWidth + } + if appoptions.Height < appoptions.MinHeight { + appoptions.Height = appoptions.MinHeight + } + if appoptions.Height > appoptions.MaxHeight { + appoptions.Height = appoptions.MaxHeight + } + } func GetTrayMenus(appoptions *App) []*menu.TrayMenu {