internal/glfw: refactoring: keep the original API when possible

Updates #1804

internal/glfw/glfw_notwindows.go

@@ -208,12 +208,8 @@ func (w *Window) SetSizeLimits(minw, minh, maxw, maxh int) {
 	w.w.SetSizeLimits(minw, minh, maxw, maxh)
 }
 
-func (w *Window) SetAspectRatioFixed(fixed bool) {
+func (w *Window) SetAspectRatio(numer, denom int) {
-	n, d := glfw.DontCare, glfw.DontCare
+	w.w.SetAspectRatio(numer, denom)
-	if fixed {
-		n, d = w.GetSize()
-	}
-	w.w.SetAspectRatio(n, d)
 }
 
 func (w *Window) SetIcon(images []image.Image) {

internal/glfw/glfw_windows.go

@@ -261,12 +261,8 @@ func (w *Window) SetSizeLimits(minw, minh, maxw, maxh int) {
 	panicError()
 }
 
-func (w *Window) SetAspectRatioFixed(fixed bool) {
+func (w *Window) SetAspectRatio(numer, denom int) {
-	n, d := -1, -1
+	glfwDLL.call("glfwSetWindowAspectRatio", w.w, uintptr(numer), uintptr(denom))
-	if fixed {
-		n, d = w.GetSize()
-	}
-	glfwDLL.call("glfwSetWindowAspectRatio", w.w, uintptr(n), uintptr(d))
 	panicError()
 }
 

internal/ui/ui_glfw.go

@@ -932,7 +932,7 @@ func (u *UserInterface) init() error {
 		u.window.Maximize()
 	}
 
-	u.window.SetAspectRatioFixed(u.isInitWindowAspectRatioFixed())
+	u.setWindowAspectRatioFixed(u.isInitWindowAspectRatioFixed())
 
 	u.window.Show()
 
@@ -1623,3 +1623,11 @@ func (u *UserInterface) setOrigPos(x, y int) {
 	u.origPosX = x
 	u.origPosY = y
 }
+
+func (u *UserInterface) setWindowAspectRatioFixed(fixed bool) {
+	n, d := glfw.DontCare, glfw.DontCare
+	if fixed {
+		n, d = u.window.GetSize()
+	}
+	u.window.SetAspectRatio(n, d)
+}

internal/ui/window_glfw.go

@@ -233,7 +233,7 @@ func (w *Window) SetAspectRatioFixed(fixed bool) {
 		return
 	}
 	w.ui.t.Call(func() {
-		w.ui.window.SetAspectRatioFixed(fixed)
+		w.ui.setWindowAspectRatioFixed(fixed)
 	})
 }