Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8210199: [linux / macOS] fileChooser can't handle emojis #471

Closed
wants to merge 2 commits into from
Closed

8210199: [linux / macOS] fileChooser can't handle emojis #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a802f4
Use UTF16 encoding for URL path in macOS
jperedadnr Apr 21, 2021
5ea2596
Use String(bytes) instead of UTF8 encoding for filenames in Linux
jperedadnr Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion modules/javafx.graphics/src/main/native-glass/gtk/GlassCommonDialogs.cpp
View file
Open in desktop
Expand Up @@ -137,10 +137,19 @@ JNIEXPORT jobject JNICALL Java_com_sun_glass_ui_gtk_GtkCommonDialogs__1showFileC
if (fnames_list_len > 0) {
jFileNames = env->NewObjectArray((jsize)fnames_list_len, jStringCls, NULL);
EXCEPTION_OCCURED(env);
const jmethodID bytesInit = env->GetMethodID(jStringCls, "<init>", "([B)V");
EXCEPTION_OCCURED(env);
for (guint i = 0; i < fnames_list_len; i++) {
filename = (char*)g_slist_nth(fnames_gslist, i)->data;
LOG1("Add [%s] into returned filenames\n", filename)
jfilename = env->NewStringUTF(filename);
int len = strlen(filename);
jbyteArray bytes = env->NewByteArray(len);
EXCEPTION_OCCURED(env);
env->SetByteArrayRegion(bytes, 0, len, (jbyte *)filename);
EXCEPTION_OCCURED(env);
jfilename = (jstring) env->NewObject(jStringCls, bytesInit, bytes);
EXCEPTION_OCCURED(env);
env->DeleteLocalRef(bytes);
EXCEPTION_OCCURED(env);
env->SetObjectArrayElement(jFileNames, (jsize)i, jfilename);
EXCEPTION_OCCURED(env);
Expand Down
7 changes: 5 additions & 2 deletions modules/javafx.graphics/src/main/native-glass/mac/GlassDialogs.m
View file
Open in desktop
Expand Up @@ -187,8 +187,11 @@ -(void)extensionFilterChanged:(NSPopUpButton*)sender

static jobject convertNSURLtoFile(JNIEnv *env, NSURL *url)
{
LOG(" url: %s", [[url path] UTF8String]);
jstring path = (*env)->NewStringUTF(env, [[url path] UTF8String]);
#ifdef VERBOSE
NSLog(@" url: %@", [url path]);
#endif // VERBOSE
NSData *data = [[url path] dataUsingEncoding:NSUTF16LittleEndianStringEncoding];
jstring path = (*env)->NewString(env, (jchar *)[data bytes], data.length/2);

jobject ret = NULL;

Expand Down