Skip to content

Commit f60b655

Browse files
committed
[Settings/MG]: Small additions for the settings UI
Change the defaults to what seems to seemingly logical ones. Make the MG settings appear when current profile is using it. Should probably add the button to the profile editor too though.
1 parent e75e5f1 commit f60b655

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public class LauncherPreferences {
7474
public static boolean PREF_VSYNC_IN_ZINK = true;
7575

7676
// MobileGlues Settings
77-
public static String MG_GLSL_CACHE_SIZE = "256";
78-
public static String MG_ANGLE_OPTION = "3";
77+
public static String MG_GLSL_CACHE_SIZE;
78+
public static String MG_ANGLE_OPTION = "2";
7979
public static String MG_NOERROR_OPTION = "0";
8080
public static String MG_EXT_GL43 = "0";
8181
public static String MG_EXT_CS = "0";
@@ -87,11 +87,11 @@ public static void loadPreferences(Context ctx) {
8787

8888
// MobileGlues Settings
8989
MG_GLSL_CACHE_SIZE = DEFAULT_PREF.getString("mg_glsl_cache_size", "256");
90-
MG_ANGLE_OPTION = DEFAULT_PREF.getString("mg_angle_option", "3");
90+
MG_ANGLE_OPTION = DEFAULT_PREF.getString("mg_angle_option", "1");
9191
MG_NOERROR_OPTION = DEFAULT_PREF.getString("mg_noerror_option", "0");
9292
MG_EXT_GL43 = DEFAULT_PREF.getString("mg_ext_gl43", "0");
9393
MG_EXT_CS = DEFAULT_PREF.getString("mg_ext_compute_shader", "0");
94-
MG_MULTIDRAWMODE_OPTION = DEFAULT_PREF.getString("mg_multidraw_mode", "2");
94+
MG_MULTIDRAWMODE_OPTION = DEFAULT_PREF.getString("mg_multidraw_mode", "0");
9595

9696

9797
PREF_RENDERER = DEFAULT_PREF.getString("renderer", "opengles2");

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceVideoFragment.java

+17-5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.os.Build;
77
import android.os.Bundle;
88

9+
import androidx.annotation.NonNull;
910
import androidx.preference.ListPreference;
1011
import androidx.preference.SwitchPreference;
1112
import androidx.preference.SwitchPreferenceCompat;
@@ -24,6 +25,7 @@
2425
import net.kdt.pojavlaunch.Tools;
2526
import net.kdt.pojavlaunch.prefs.CustomSeekBarPreference;
2627
import net.kdt.pojavlaunch.prefs.LauncherPreferences;
28+
import net.kdt.pojavlaunch.value.launcherprofiles.LauncherProfiles;
2729

2830
import com.kdt.ui.dialog.*;
2931

@@ -75,14 +77,13 @@ public void onCreatePreferences(Bundle b, String str) {
7577
rendererListPreference.setEntries(renderersList.rendererDisplayNames);
7678
rendererListPreference.setEntryValues(renderersList.rendererIds.toArray(new String[0]));
7779

78-
rendererListPreference.setOnPreferenceChangeListener((preference, obj) -> {
79-
String currentRenderer = (String) obj;
80-
Tools.LOCAL_RENDERER = currentRenderer;
81-
mgRendererSettingsPref.setVisible(currentRenderer.equals("opengles_mobileglues"));
80+
rendererListPreference.setOnPreferenceChangeListener((unused, selectedRenderer) -> {
81+
setSelectedRenderer(selectedRenderer); // This is needed to see what renderer is selected
82+
mgRendererSettingsPref.setVisible(MGRendererSelected());
8283
return true;
8384
});
8485

85-
requirePreference("renderer_mobileglues_settings").setVisible(PREF_RENDERER.equals("opengles_mobileglues"));
86+
requirePreference("renderer_mobileglues_settings").setVisible(MGRendererSelected());
8687

8788
computeVisibility();
8889
}
@@ -200,4 +201,15 @@ private void mgRendererSettings() {
200201
.build()
201202
.show();
202203
}
204+
private Object selectedRenderer;
205+
private void setSelectedRenderer(Object selectedRenderer){
206+
this.selectedRenderer = selectedRenderer;
207+
}
208+
private Object getSelectedRenderer(){
209+
return this.selectedRenderer;
210+
}
211+
@NonNull
212+
private Boolean MGRendererSelected() {
213+
return getSelectedRenderer().equals("opengles_mobileglues") || LauncherProfiles.getCurrentProfile().pojavRendererName.equals("opengles_mobileglues");
214+
}
203215
}

0 commit comments

Comments
 (0)