deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: min/max constraint logic

Browse source
This commit is contained in:
Lea Anthony 2021-04-27 19:31:56 +10:00
commit 385988989b
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
v2/pkg/options/options.go
View file

@ -19,6 +19,7 @@ type App struct {
Height int
DisableResize bool
Fullscreen bool
Frameless bool
MinWidth int
MinHeight int
MaxWidth int
@ -46,13 +47,16 @@ func MergeDefaults(appoptions *App) {
}
// Ensure max and min are valid
if appoptions.MinWidth > appoptions.MaxWidth {
appoptions.MinWidth = appoptions.MaxWidth
if appoptions.MinWidth > 0 && appoptions.MaxWidth > 0 {
if appoptions.MinWidth > appoptions.MaxWidth {
appoptions.MinWidth = appoptions.MaxWidth
}
}
if appoptions.MinHeight > appoptions.MaxHeight {
appoptions.MinHeight = appoptions.MaxHeight
if appoptions.MinHeight > 0 && appoptions.MaxHeight > 0 {
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