Some changes, on descirption

- (custom_env.txt) Add a way to add custom environment variables.
- [V2 UI] Fix crashing on click settings menu
This commit is contained in:
khanhduytran0 2020-10-12 12:31:05 +07:00
parent 984f446bb9
commit 2a2cab33b1
3 changed files with 11 additions and 1 deletions

View File

@ -123,6 +123,15 @@ public class JREUtils
setEnvironment(launchType, "AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth));
setEnvironment(launchType, "AWTSTUB_HEIGHT", Integer.toString(CallbackBridge.windowHeight));
BufferedReader reader = new BufferedReader(new FileReader(new File(Tools.MAIN_PATH, "custom_env.txt")));
String line;
while ((line = reader.readLine()) != null) {
// Not use split() as only split first one
int index = line.indexOf("=");
setEnvironment(launchType, line.substring(0, index), line.substring(index + 1));
}
reader.close();
// REGAL_GL_EXTENSIONS
setLdLibraryPath(ldLibraryPath);

View File

@ -116,7 +116,7 @@ public class PojavLauncherActivity extends AppCompatActivity
viewPageAdapter.addFragment(new LauncherPreferenceFragment(), R.drawable.ic_menu_settings, getString(R.string.mcl_option_settings));
viewPager.setAdapter(viewPageAdapter);
tabLayout.setTabMode(VerticalTabLayout.MODE_SCROLLABLE);
// tabLayout.setTabMode(VerticalTabLayout.MODE_SCROLLABLE);
tabLayout.setupWithViewPager(viewPager);
tabLayout.setLastTabAsBottom();

View File

@ -179,6 +179,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglTerminate(JNIEnv* e
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nativeRegalMakeCurrent(JNIEnv *env, jclass clazz) {
printf("Regal: making current");
RegalMakeCurrent_func *RegalMakeCurrent = (RegalMakeCurrent_func *) dlsym(RTLD_DEFAULT, "RegalMakeCurrent");
RegalMakeCurrent(potatoBridge.eglContext);
}