From 35e29a29e751984d8ee93132a24a238086abfdb1 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Tue, 30 Apr 2024 23:32:54 +0900 Subject: [PATCH] internal/ui: bug fix: wrong property names were specified Closes #2975 --- ebiten_test.go | 32 ++++++++++++++++++++++++ internal/ui/screensizeinfullscreen_js.go | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 ebiten_test.go diff --git a/ebiten_test.go b/ebiten_test.go new file mode 100644 index 000000000..bf0ceb254 --- /dev/null +++ b/ebiten_test.go @@ -0,0 +1,32 @@ +// Copyright 2024 The Ebitengine Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package ebiten_test + +import ( + "testing" + + "github.com/hajimehoshi/ebiten/v2" +) + +func TestScreenSizeInFullscreen(t *testing.T) { + // Just call ScreenSizeInFullscreen. There was a crash bug on browsers (#2975). + w, h := ebiten.ScreenSizeInFullscreen() + if w <= 0 { + t.Errorf("w must be positive but not: %d", w) + } + if h <= 0 { + t.Errorf("h must be positive but not: %d", h) + } +} diff --git a/internal/ui/screensizeinfullscreen_js.go b/internal/ui/screensizeinfullscreen_js.go index 40ed9b5c0..336400614 100644 --- a/internal/ui/screensizeinfullscreen_js.go +++ b/internal/ui/screensizeinfullscreen_js.go @@ -16,5 +16,5 @@ package ui func (u *UserInterface) ScreenSizeInFullscreen() (int, int) { // On browsers, ScreenSizeInFullscreen returns the 'window' (global object) size, not 'screen' size for backward compatibility (#2145). - return window.Get("width").Int(), window.Get("height").Int() + return window.Get("innerWidth").Int(), window.Get("innerHeight").Int() }