Skip to content

Commit c67128f

Browse files
committed
fix: migrate evewrything related to sdl to the new sdl version
1 parent e510ae7 commit c67128f

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
# for the other pavckages see https://github.com/msys2/MINGW-packages/commit/62308009e77d772a126313626b194e503b0e5135
140140
install: |
141141
nghttp3=1.9
142-
SDL2=2.32.4
142+
SDL2=2.32.8
143143
aom=3.12.0
144144
curl=8.13.0
145145
gnutls=3.8.8

platforms/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<application android:label="@string/app_name"
6363
android:icon="@mipmap/ic_launcher"
6464
android:allowBackup="true"
65-
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
65+
android:theme="@style/AppTheme"
6666
android:hardwareAccelerated="true" >
6767

6868
<!-- Example of setting SDL hints from AndroidManifest.xml:

platforms/android/app/src/main/java/org/libsdl/app/SDLActivity.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
6161
private static final String TAG = "SDL";
6262
private static final int SDL_MAJOR_VERSION = 2;
63-
private static final int SDL_MINOR_VERSION = 30;
64-
private static final int SDL_MICRO_VERSION = 6;
63+
private static final int SDL_MINOR_VERSION = 32;
64+
private static final int SDL_MICRO_VERSION = 8;
6565
/*
6666
// Display InputType.SOURCE/CLASS of events and devices
6767
//
@@ -89,7 +89,7 @@ public static void debugSource(int sources, String prefix) {
8989
| InputDevice.SOURCE_CLASS_POSITION
9090
| InputDevice.SOURCE_CLASS_TRACKBALL);
9191
92-
if (s2 != 0) cls += "Some_Unkown";
92+
if (s2 != 0) cls += "Some_Unknown";
9393
9494
s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
9595
@@ -163,7 +163,7 @@ public static void debugSource(int sources, String prefix) {
163163
if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
164164
s2 &= ~FLAG_TAINTED;
165165
166-
if (s2 != 0) src += " Some_Unkown";
166+
if (s2 != 0) src += " Some_Unknown";
167167
168168
Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
169169
}
@@ -791,6 +791,9 @@ public void handleMessage(Message msg) {
791791
window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
792792
SDLActivity.mFullscreenModeActive = false;
793793
}
794+
if (Build.VERSION.SDK_INT >= 28 /* Android 9 (Pie) */) {
795+
window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
796+
}
794797
}
795798
} else {
796799
Log.e(TAG, "error handling message, getContext() returned no Activity");
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<resources>
2-
33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
4+
<style name="AppTheme" parent="android:Theme.NoTitleBar.Fullscreen">
55
<!-- Customize your theme here. -->
66
</style>
7-
87
</resources>

platforms/versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## 3ds section
44

5-
export SDL_3DS_VERSION="2.30.6"
5+
export SDL_3DS_VERSION="2.32.8"
66

77
export SDL_TTF_3DS_VERSION="2.22.0"
88

0 commit comments

Comments
 (0)