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

internal/ui: replace deprecated APIs

Browse Source 
[UIScreen mainScreen] is now deprecated.
This commit is contained in:
Hajime Hoshi 2024-09-16 18:20:01 +09:00
parent a113687d56
commit 4a10702f6c
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/ui/ui_android.go
View File

@ -119,7 +119,7 @@ func (*graphicsDriverCreatorImpl) newPlayStation5() (graphicsdriver.Graphics, er
return nil, errors.New("ui: PlayStation 5 is not supported in this environment") return nil, errors.New("ui: PlayStation 5 is not supported in this environment")
} }
func deviceScaleFactorImpl() float64 { func (u *UserInterface) deviceScaleFactor() float64 {
var s float64 var s float64
if err := app.RunOnJVM(func(vm, env, ctx uintptr) error { if err := app.RunOnJVM(func(vm, env, ctx uintptr) error {
// TODO: This might be crash when this is called from init(). How can we detect this? // TODO: This might be crash when this is called from init(). How can we detect this?

33
internal/ui/ui_ios.go
View File

@ -19,8 +19,31 @@ package ui
// //
// #import <UIKit/UIKit.h> // #import <UIKit/UIKit.h>
// //
// static double devicePixelRatio() { // static double devicePixelRatioOnMainThread(UIView* view) {
// return [[UIScreen mainScreen] nativeScale]; // UIWindow* window = view.window;
// if (!window) {
// return 1;
// }
// UIWindowScene* scene = window.windowScene;
// if (!scene) {
// return 1;
// }
// return scene.screen.nativeScale;
// }
//
// static double devicePixelRatio(uintptr_t viewPtr) {
// if (!viewPtr) {
// return 1;
// }
// UIView* view = (__bridge UIView*)(void*)viewPtr;
// if ([NSThread isMainThread]) {
// return devicePixelRatioOnMainThread(view);
// }
// __block double scale;
// dispatch_sync(dispatch_get_main_queue(), ^{
// scale = devicePixelRatioOnMainThread(view);
// });
// return scale;
// } // }
import "C" import "C"
@ -66,6 +89,7 @@ func (*graphicsDriverCreatorImpl) newPlayStation5() (graphicsdriver.Graphics, er
} }
func (u *UserInterface) SetUIView(uiview uintptr) error { func (u *UserInterface) SetUIView(uiview uintptr) error {
u.uiView.Store(uiview)
select { select {
case err := <-u.errCh: case err := <-u.errCh:
return err return err
@ -89,9 +113,8 @@ func (u *UserInterface) IsGL() (bool, error) {
return u.GraphicsLibrary() == GraphicsLibraryOpenGL, nil return u.GraphicsLibrary() == GraphicsLibraryOpenGL, nil
} }
func deviceScaleFactorImpl() float64 { func (u *UserInterface) deviceScaleFactor() float64 {
// TODO: Can this be called from non-main threads? return float64(C.devicePixelRatio(C.uintptr_t(u.uiView.Load())))
return float64(C.devicePixelRatio())
} }
func dipToNativePixels(x float64, scale float64) float64 { func dipToNativePixels(x float64, scale float64) float64 {

5
internal/ui/ui_mobile.go
View File

@ -104,6 +104,9 @@ type userInterfaceImpl struct {
strictContextRestoration atomic.Bool strictContextRestoration atomic.Bool
strictContextRestorationOnce sync.Once strictContextRestorationOnce sync.Once
// uiView is used only on iOS.
uiView atomic.Uintptr
m sync.RWMutex m sync.RWMutex
} }
@ -285,7 +288,7 @@ func (m *Monitor) DeviceScaleFactor() float64 {
// Initialize this lazily. // Initialize this lazily.
m.deviceScaleFactorOnce.Do(func() { m.deviceScaleFactorOnce.Do(func() {
// Assume that the device scale factor never changes on mobiles. // Assume that the device scale factor never changes on mobiles.
m.deviceScaleFactor = deviceScaleFactorImpl() m.deviceScaleFactor = theUI.deviceScaleFactor()
}) })
return m.deviceScaleFactor return m.deviceScaleFactor
} }