mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-27 04:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "internal/ui: bug fix: disable window size limitation on fullscreen"

Browse Source 
This reverts commit 9a5ef1b553.

Reason: we should disable the green button instead

Updates #2260
This commit is contained in:
Hajime Hoshi 2023-09-16 03:22:52 +09:00
parent 657e4c2541
commit 128215eedd
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/ui/ui_glfw.go
View File

@ -1321,14 +1321,6 @@ func (u *userInterfaceImpl) updateWindowSizeLimits() {
u.window.SetSizeLimits(minw, minh, maxw, maxh) u.window.SetSizeLimits(minw, minh, maxw, maxh)
} }
// disableWindowSizeLimits disables a window size limitation temporarily, especially for fullscreen
// In order to enable the size limitation, call updateWindowSizeLimits.
//
// disableWindowSizeLimits must be called from the main thread.
func (u *userInterfaceImpl) disableWindowSizeLimits() {
u.window.SetSizeLimits(glfw.DontCare, glfw.DontCare, glfw.DontCare, glfw.DontCare)
}
// adjustWindowSizeBasedOnSizeLimitsInDIP adjust the size based on the window size limits. // adjustWindowSizeBasedOnSizeLimitsInDIP adjust the size based on the window size limits.
// width and height are in device-independent pixels. // width and height are in device-independent pixels.
func (u *userInterfaceImpl) adjustWindowSizeBasedOnSizeLimitsInDIP(width, height int) (int, int) { func (u *userInterfaceImpl) adjustWindowSizeBasedOnSizeLimitsInDIP(width, height int) (int, int) {
@ -1405,8 +1397,6 @@ func (u *userInterfaceImpl) setFullscreen(fullscreen bool) {
// Enter the fullscreen. // Enter the fullscreen.
if fullscreen { if fullscreen {
u.disableWindowSizeLimits()
if x, y := u.origWindowPos(); x == invalidPos || y == invalidPos { if x, y := u.origWindowPos(); x == invalidPos || y == invalidPos {
u.setOrigWindowPos(u.window.GetPos()) u.setOrigWindowPos(u.window.GetPos())
} }
@ -1427,7 +1417,6 @@ func (u *userInterfaceImpl) setFullscreen(fullscreen bool) {
} }
// Exit the fullscreen. // Exit the fullscreen.
u.updateWindowSizeLimits()
// Get the original window position and size before changing the state of fullscreen. // Get the original window position and size before changing the state of fullscreen.
// TODO: Why? // TODO: Why?

2
internal/ui/ui_glfw_darwin.go
View File

@ -122,7 +122,6 @@ func init() {
{ {
Cmd: sel_windowWillEnterFullScreen, Cmd: sel_windowWillEnterFullScreen,
Fn: func(id objc.ID, cmd objc.SEL, notification objc.ID) { Fn: func(id objc.ID, cmd objc.SEL, notification objc.ID) {
theUI.disableWindowSizeLimits()
theUI.setOrigWindowPosWithCurrentPos() theUI.setOrigWindowPosWithCurrentPos()
pushResizableState(id, cocoa.NSNotification{ID: notification}.Object()) pushResizableState(id, cocoa.NSNotification{ID: notification}.Object())
}, },
@ -137,7 +136,6 @@ func init() {
Cmd: sel_windowWillExitFullScreen, Cmd: sel_windowWillExitFullScreen,
Fn: func(id objc.ID, cmd objc.SEL, notification objc.ID) { Fn: func(id objc.ID, cmd objc.SEL, notification objc.ID) {
pushResizableState(id, cocoa.NSNotification{ID: notification}.Object()) pushResizableState(id, cocoa.NSNotification{ID: notification}.Object())
theUI.updateWindowSizeLimits()
}, },
}, },
{ {