Unverified Commit 3c5a878b authored by Leon Linhart's avatar Leon Linhart Committed by GitHub

Fixed `getCurrentSystemTheme` throwing UnsatisfiedLinkError (#464)

See https://github.com/JetBrains/compose-jb/issues/1761

This was caused by 242bf304 since `SystemTheme.jvm.kt` was renamed to `SystemTheme.awt.kt` and the corresponding native functions were not updated.
parent c476c1ea
...@@ -88,7 +88,7 @@ extern "C" ...@@ -88,7 +88,7 @@ extern "C"
return (float) getDpiScaleByDisplay(dsi_x11->display); return (float) getDpiScaleByDisplay(dsi_x11->display);
} }
JNIEXPORT jint JNICALL Java_org_jetbrains_skiko_SystemTheme_1jvmKt_getCurrentSystemTheme(JNIEnv *env, jobject topLevel) JNIEXPORT jint JNICALL Java_org_jetbrains_skiko_SystemTheme_1awtKt_getCurrentSystemTheme(JNIEnv *env, jobject topLevel)
{ {
// Unknown. // Unknown.
return 2; return 2;
......
...@@ -28,7 +28,7 @@ extern "C" ...@@ -28,7 +28,7 @@ extern "C"
return (jlong) dsi_win->hwnd; return (jlong) dsi_win->hwnd;
} }
JNIEXPORT jint JNICALL Java_org_jetbrains_skiko_SystemTheme_1jvmKt_getCurrentSystemTheme(JNIEnv *env, jobject topLevel) JNIEXPORT jint JNICALL Java_org_jetbrains_skiko_SystemTheme_1awtKt_getCurrentSystemTheme(JNIEnv *env, jobject topLevel)
{ {
auto subkey = L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; auto subkey = L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
auto name = L"AppsUseLightTheme"; auto name = L"AppsUseLightTheme";
......
...@@ -385,7 +385,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_PlatformOperationsKt_osxDisableT ...@@ -385,7 +385,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_PlatformOperationsKt_osxDisableT
} }
} }
JNIEXPORT jint JNICALL Java_org_jetbrains_skiko_SystemTheme_1jvmKt_getCurrentSystemTheme(JNIEnv *env, jobject topLevel) JNIEXPORT jint JNICALL Java_org_jetbrains_skiko_SystemTheme_1awtKt_getCurrentSystemTheme(JNIEnv *env, jobject topLevel)
{ {
@autoreleasepool { @autoreleasepool {
NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]; NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment