ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow resizable activity in android

Browse Source
This commit is contained in:
Benau 2020-07-12 10:15:21 +08:00
parent 90a6dc6023
commit 8ede6dcaa7
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/AndroidManifest.xml
View File

@ -12,7 +12,7 @@
android:isGame="true" android:isGame="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:resizeableActivity="false"> android:resizeableActivity="true">
<activity android:name=".SuperTuxKartActivity" <activity android:name=".SuperTuxKartActivity"
android:label="@string/app_name" android:label="@string/app_name"

5
lib/irrlicht/source/Irrlicht/CGUIStaticText.cpp
View File

@ -298,7 +298,10 @@ void CGUIStaticText::setText(const core::stringw& text)
void CGUIStaticText::updateAbsolutePosition() void CGUIStaticText::updateAbsolutePosition()
{ {
IGUIElement::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();
} }

20
lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
View File

@ -529,18 +529,30 @@ bool CIrrDeviceSDL::run()
case SDL_SENSORUPDATE: case SDL_SENSORUPDATE:
if (SDL_event.sensor.which == AccelerometerInstance) if (SDL_event.sensor.which == AccelerometerInstance)
{ {
SDL_DisplayOrientation o = SDL_GetDisplayOrientation(0);
irrevent.EventType = irr::EET_ACCELEROMETER_EVENT; irrevent.EventType = irr::EET_ACCELEROMETER_EVENT;
irrevent.AccelerometerEvent.X = SDL_event.sensor.data[0]; if (o == SDL_ORIENTATION_LANDSCAPE ||
irrevent.AccelerometerEvent.Y = SDL_event.sensor.data[1]; 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]; irrevent.AccelerometerEvent.Z = SDL_event.sensor.data[2];
// Mobile STK specific // Mobile STK specific
if (irrevent.AccelerometerEvent.X < 0.0) if (irrevent.AccelerometerEvent.X < 0.0)
irrevent.AccelerometerEvent.X *= -1.0; irrevent.AccelerometerEvent.X *= -1.0;
#ifdef IOS_STK #ifdef IOS_STK
if (SDL_GetDisplayOrientation(0) == SDL_ORIENTATION_LANDSCAPE) if (o == SDL_ORIENTATION_LANDSCAPE)
irrevent.AccelerometerEvent.Y *= -1.0; irrevent.AccelerometerEvent.Y *= -1.0;
#else #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; irrevent.AccelerometerEvent.Y *= -1.0;
#endif #endif
postEventFromUser(irrevent); postEventFromUser(irrevent);