archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 20:01:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

[Android] On-screen controls work for Software Renderer, but not the OpenGL ES 3 video backend yet. Enabled it for Software Rendering and disabled it for Open GL ES 3.

Browse source
This commit is contained in:
Lioncash 2013-09-01 20:31:45 -04:00
parent 71fde876df
commit acf3bd8697
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java
View file

@ -207,7 +207,7 @@ public final class VideoSettingsFragment extends PreferenceFragment
// denotes the placement on the UI. So if more elements are // denotes the placement on the UI. So if more elements are
// added to the video settings, these may need to change. // added to the video settings, these may need to change.
// //
final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(m_activity);
final PreferenceScreen mainScreen = getPreferenceScreen(); final PreferenceScreen mainScreen = getPreferenceScreen();
if (videoBackends.getValue().equals("Software Renderer")) if (videoBackends.getValue().equals("Software Renderer"))
@ -215,14 +215,13 @@ public final class VideoSettingsFragment extends PreferenceFragment
mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(0).setEnabled(false);
mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(1).setEnabled(false);
mainScreen.getPreference(3).setEnabled(false); mainScreen.getPreference(3).setEnabled(false);
mainScreen.getPreference(4).setEnabled(false);
} }
else if (videoBackends.getValue().equals("OGL")) else if (videoBackends.getValue().equals("OGL"))
{ {
mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(0).setEnabled(true);
mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(1).setEnabled(true);
mainScreen.getPreference(3).setEnabled(true); mainScreen.getPreference(3).setEnabled(true);
mainScreen.getPreference(4).setEnabled(true); mainScreen.getPreference(4).setEnabled(false);
} }
// Also set a listener, so that if someone changes the video backend, it will disable // Also set a listener, so that if someone changes the video backend, it will disable
@ -239,14 +238,13 @@ public final class VideoSettingsFragment extends PreferenceFragment
mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(0).setEnabled(false);
mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(1).setEnabled(false);
mainScreen.getPreference(3).setEnabled(false); mainScreen.getPreference(3).setEnabled(false);
mainScreen.getPreference(4).setEnabled(false);
} }
else if (preference.getString(key, "Software Renderer").equals("OGL")) else if (preference.getString(key, "Software Renderer").equals("OGL"))
{ {
mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(0).setEnabled(true);
mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(1).setEnabled(true);
mainScreen.getPreference(3).setEnabled(true); mainScreen.getPreference(3).setEnabled(true);
mainScreen.getPreference(4).setEnabled(true); mainScreen.getPreference(4).setEnabled(false);
} }
} }
} }