mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Forbid RestoreWindow when the window is not maximized nor minimized

Browse Source 
Fixes #1124
This commit is contained in:
Hajime Hoshi 2020-03-31 02:48:19 +09:00
parent b470dace1a
commit 161d8aae8f
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/windowsize/main.go
View File

@ -231,7 +231,10 @@ func (g *game) Update(screen *ebiten.Image) error {
} }
maximize := inpututil.IsKeyJustPressed(ebiten.KeyM) maximize := inpututil.IsKeyJustPressed(ebiten.KeyM)
minimize := inpututil.IsKeyJustPressed(ebiten.KeyN) minimize := inpututil.IsKeyJustPressed(ebiten.KeyN)
restore := inpututil.IsKeyJustPressed(ebiten.KeyE) restore := false
if ebiten.IsWindowMaximized() || ebiten.IsWindowMinimized() {
restore = inpututil.IsKeyJustPressed(ebiten.KeyE)
}
if toUpdateWindowSize { if toUpdateWindowSize {
if *flagLegacy { if *flagLegacy {

10
window.go
View File

@ -278,10 +278,15 @@ func MaximizeWindow() {
// IsWindowMaximized reports whether the window is maximized or not. // IsWindowMaximized reports whether the window is maximized or not.
// //
// IsWindowMaximized returns false when the window is not resizable.
//
// IsWindowMaximized always returns false on browsers and mobiles. // IsWindowMaximized always returns false on browsers and mobiles.
// //
// IsWindowMaximized is concurrent-safe. // IsWindowMaximized is concurrent-safe.
func IsWindowMaximized() bool { func IsWindowMaximized() bool {
if !IsWindowResizable() {
return false
}
if w := uiDriver().Window(); w != nil { if w := uiDriver().Window(); w != nil {
return w.IsMaximized() return w.IsMaximized()
} }
@ -315,8 +320,13 @@ func IsWindowMinimized() bool {
// RestoreWindow restores the window from its maximized or minimized state. // RestoreWindow restores the window from its maximized or minimized state.
// //
// RestoreWindow panics when the window is not maximized nor minimized.
//
// RestoreWindow is concurrent-safe. // RestoreWindow is concurrent-safe.
func RestoreWindow() { func RestoreWindow() {
if !IsWindowMaximized() && !IsWindowMinimized() {
panic("ebiten: RestoreWindow must be called on a maximized or a minimized window")
}
if w := uiDriver().Window(); w != nil { if w := uiDriver().Window(); w != nil {
w.Restore() w.Restore()
} }