From 8ede6dcaa7cf391f01fac3cc44220b1708a3a9e6 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Sun, 12 Jul 2020 10:15:21 +0800
Subject: [PATCH] Allow resizable activity in android

---
 android/AndroidManifest.xml                   |  2 +-
 .../source/Irrlicht/CGUIStaticText.cpp        |  5 ++++-
 .../source/Irrlicht/CIrrDeviceSDL.cpp         | 20 +++++++++++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e0cda09ca..1cf88995b 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -12,7 +12,7 @@
                  android:isGame="true"
                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                  android:hardwareAccelerated="true"
-                 android:resizeableActivity="false">
+                 android:resizeableActivity="true">
 
         <activity android:name=".SuperTuxKartActivity"
                   android:label="@string/app_name"
diff --git a/lib/irrlicht/source/Irrlicht/CGUIStaticText.cpp b/lib/irrlicht/source/Irrlicht/CGUIStaticText.cpp
index 9cc909c3e..b8b566f92 100644
--- a/lib/irrlicht/source/Irrlicht/CGUIStaticText.cpp
+++ b/lib/irrlicht/source/Irrlicht/CGUIStaticText.cpp
@@ -298,7 +298,10 @@ void CGUIStaticText::setText(const core::stringw& text)
 void CGUIStaticText::updateAbsolutePosition()
 {
 	IGUIElement::updateAbsolutePosition();
-	breakText();
+	// If use glyph layouts only there is no way at the moment to re-break the
+	// text
+	if (!m_use_glyph_layouts_only)
+		breakText();
 }
 
 
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
index bbdce18c4..2e5dcc86f 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
@@ -529,18 +529,30 @@ bool CIrrDeviceSDL::run()
 		case SDL_SENSORUPDATE:
 			if (SDL_event.sensor.which == AccelerometerInstance)
 			{
+				SDL_DisplayOrientation o = SDL_GetDisplayOrientation(0);
 				irrevent.EventType = irr::EET_ACCELEROMETER_EVENT;
-				irrevent.AccelerometerEvent.X = SDL_event.sensor.data[0];
-				irrevent.AccelerometerEvent.Y = SDL_event.sensor.data[1];
+				if (o == SDL_ORIENTATION_LANDSCAPE ||
+					o == SDL_ORIENTATION_LANDSCAPE_FLIPPED)
+				{
+					irrevent.AccelerometerEvent.X = SDL_event.sensor.data[0];
+					irrevent.AccelerometerEvent.Y = SDL_event.sensor.data[1];
+				}
+				else
+				{
+					// For android multi-window mode vertically
+					irrevent.AccelerometerEvent.X = -SDL_event.sensor.data[1];
+					irrevent.AccelerometerEvent.Y = -SDL_event.sensor.data[0];
+				}
 				irrevent.AccelerometerEvent.Z = SDL_event.sensor.data[2];
 				// Mobile STK specific
 				if (irrevent.AccelerometerEvent.X < 0.0)
 					irrevent.AccelerometerEvent.X *= -1.0;
 #ifdef IOS_STK
-				if (SDL_GetDisplayOrientation(0) == SDL_ORIENTATION_LANDSCAPE)
+				if (o == SDL_ORIENTATION_LANDSCAPE)
 					irrevent.AccelerometerEvent.Y *= -1.0;
 #else
-				if (SDL_GetDisplayOrientation(0) == SDL_ORIENTATION_LANDSCAPE_FLIPPED)
+				if (o == SDL_ORIENTATION_LANDSCAPE_FLIPPED ||
+					o == SDL_ORIENTATION_PORTRAIT_FLIPPED)
 					irrevent.AccelerometerEvent.Y *= -1.0;
 #endif
 				postEventFromUser(irrevent);