mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-19 21:02:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

ebiten: rename SetKeepWindowAspectRatio -> SetWindowAspectRatioFixed

Browse Source 
Updates #1804
This commit is contained in:
Hajime Hoshi 2022-02-09 19:29:51 +09:00
parent 18659ef4ab
commit 623c050537
6 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/glfw/glfw_notwindows.go
View File

@ -208,9 +208,9 @@ func (w *Window) SetSizeLimits(minw, minh, maxw, maxh int) {
w.w.SetSizeLimits(minw, minh, maxw, maxh)
}
func (w *Window) SetKeepAspectRatio(keep bool) {
func (w *Window) SetAspectRatioFixed(fixed bool) {
n, d := glfw.DontCare, glfw.DontCare
if keep {
if fixed {
n, d = w.GetSize()
}
w.w.SetAspectRatio(n, d)

4
internal/glfw/glfw_windows.go
View File

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

13
internal/ui/ui_glfw.go
View File

@ -95,7 +95,7 @@ type UserInterface struct {
initWindowHeightInDIP int
initWindowFloating bool
initWindowMaximized bool
initWindowKeepAspectRatio bool
initWindowAspectRatioFixed bool
initScreenTransparent bool
initFocused bool
@ -280,16 +280,16 @@ func (u *UserInterface) setWindowSizeLimitsInDIP(minw, minh, maxw, maxh int) boo
return true
}
func (u *UserInterface) isInitWindowKeepAspectRatio() bool {
func (u *UserInterface) isInitWindowAspectRatioFixed() bool {
u.m.RLock()
v := u.initWindowKeepAspectRatio
v := u.initWindowAspectRatioFixed
u.m.RUnlock()
return v
}
func (u *UserInterface) setInitWindowKeepAspectRatio(keep bool) {
func (u *UserInterface) setInitWindowAspectRatioFixed(fixed bool) {
u.m.Lock()
u.initWindowKeepAspectRatio = keep
u.initWindowAspectRatioFixed = fixed
u.m.Unlock()
}
@ -932,8 +932,7 @@ func (u *UserInterface) init() error {
u.window.Maximize()
}
keepAspectRatio := u.isInitWindowKeepAspectRatio()
u.window.SetKeepAspectRatio(keepAspectRatio)
u.window.SetAspectRatioFixed(u.isInitWindowAspectRatioFixed())
u.window.Show()

6
internal/ui/window_glfw.go
View File

@ -227,13 +227,13 @@ func (w *Window) SetSizeLimits(minw, minh, maxw, maxh int) {
w.ui.t.Call(w.ui.updateWindowSizeLimits)
}
func (w *Window) SetKeepAspectRatio(keep bool) {
func (w *Window) SetAspectRatioFixed(fixed bool) {
if !w.ui.isRunning() {
w.ui.setInitWindowKeepAspectRatio(keep)
w.ui.setInitWindowAspectRatioFixed(fixed)
return
}
w.ui.t.Call(func() {
w.ui.window.SetKeepAspectRatio(keep)
w.ui.window.SetAspectRatioFixed(fixed)
})
}

2
internal/ui/window_null.go
View File

@ -79,7 +79,7 @@ func (*Window) IsMinimized() bool {
return false
}
func (*Window) SetKeepAspectRatio(keep bool) {
func (*Window) SetAspectRatioFixed(fixed bool) {
}
func (*Window) SetIcon(iconImages []image.Image) {

8
window.go
View File

@ -72,11 +72,9 @@ func SetWindowResizable(resizable bool) {
ui.Get().Window().SetResizable(resizable)
}
// SetWindowKeepAspectRatio sets whether the window should keep its aspect ratio while resizing.
func SetWindowKeepAspectRatio(keep bool) {
if w := ui.Get().Window(); w != nil {
w.SetKeepAspectRatio(keep)
}
// SetWindowAspectRatioFixed sets whether the window should keep its aspect ratio while resizing.
func SetWindowAspectRatioFixed(fixed bool) {
ui.Get().Window().SetAspectRatioFixed(fixed)
}
// SetWindowTitle sets the title of the window.