diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 430072928..6575d45cc 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -636,6 +636,11 @@ void TouchTestScreen::CreateViews() { root_->Add(new Button(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); } +#if PPSSPP_PLATFORM(ANDROID) +extern int display_xres; +extern int display_yres; +#endif + void TouchTestScreen::render() { UIDialogScreenWithBackground::render(); UIContext *ui_context = screenManager()->getUIContext(); @@ -659,11 +664,17 @@ void TouchTestScreen::render() { } snprintf(buffer, sizeof(buffer), +#if PPSSPP_PLATFORM(ANDROID) + "display_res: %dx%d\n" +#endif "dp_res: %dx%d\n" "pixel_res: %dx%d\n" "g_dpi: %f\n" "g_dpi_scale: %0.3fx%0.3f\n" "g_dpi_scale_real: %0.3fx%0.3f\n", +#if PPSSPP_PLATFORM(ANDROID) + display_xres, display_yres, +#endif dp_xres, dp_yres, pixel_xres, pixel_yres, g_dpi, diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 78ff47289..b4719f590 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -1006,6 +1006,7 @@ void NativeRender(GraphicsContext *graphicsContext) { } if (resized) { + ILOG("Resized flag set - recalculating bounds"); resized = false; if (uiContext) { @@ -1275,6 +1276,7 @@ void NativeMessageReceived(const char *message, const char *value) { void NativeResized() { // NativeResized can come from any thread so we just set a flag, then process it later. if (g_graphicsInited) { + ILOG("NativeResized - setting flag"); resized = true; } else { ILOG("NativeResized ignored, not initialized"); diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 2dfd00185..1f9655b3a 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -101,8 +101,9 @@ static int deviceType; // Should only be used for display detection during startup (for config defaults etc) // This is the ACTUAL display size, not the hardware scaled display size. -static int display_xres; -static int display_yres; +// Exposed so it can be displayed on the touchscreen test. +int display_xres; +int display_yres; static int display_dpi_x; static int display_dpi_y; static int backbuffer_format; // Android PixelFormat enum