mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: Use the predefined layout values

Browse source
This commit is contained in:
Abandoned Cart 2023-06-04 10:34:59 -04:00
commit 4767fe993b
1 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
View file

@ -184,12 +184,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
override fun onConfigurationChanged(newConfig: Configuration) { override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig) super.onConfigurationChanged(newConfig)
var emulatorLayout = 5 val emulatorLayout = when (newConfig.orientation) {
when (newConfig.orientation) { Configuration.ORIENTATION_LANDSCAPE -> { EmulationMenuSettings.LayoutOption_MobileLandscape }
Configuration.ORIENTATION_LANDSCAPE -> { emulatorLayout = 5 } Configuration.ORIENTATION_PORTRAIT -> { EmulationMenuSettings.LayoutOption_MobilePortrait }
Configuration.ORIENTATION_PORTRAIT -> { emulatorLayout = 4 } Configuration.ORIENTATION_UNDEFINED -> { EmulationMenuSettings.LayoutOption_MobileLandscape }
Configuration.ORIENTATION_UNDEFINED -> { emulatorLayout = 5 } else -> { EmulationMenuSettings.LayoutOption_MobileLandscape }
else -> {}
} }
emulationActivity?.let { emulationActivity?.let {
@ -253,9 +252,15 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
private fun updateScreenLayout() { private fun updateScreenLayout() {
emulationActivity?.let { emulationActivity?.let {
when (EmulationMenuSettings.screenLayout) { when (EmulationMenuSettings.screenLayout) {
5 -> { it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE } EmulationMenuSettings.LayoutOption_MobileLandscape -> {
4 -> { it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT } it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
0 -> { it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED } }
EmulationMenuSettings.LayoutOption_MobilePortrait -> {
it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
}
EmulationMenuSettings.LayoutOption_Default -> {
it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
}
else -> { it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE } else -> { it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE }
} }
} }
@ -312,9 +317,15 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
findItem(R.id.menu_toggle_fps).isChecked = EmulationMenuSettings.showFps findItem(R.id.menu_toggle_fps).isChecked = EmulationMenuSettings.showFps
findItem(R.id.menu_screen_layout).subMenu?.let { subMenu -> findItem(R.id.menu_screen_layout).subMenu?.let { subMenu ->
when (EmulationMenuSettings.screenLayout) { when (EmulationMenuSettings.screenLayout) {
5 -> { subMenu.findItem(R.id.menu_screen_layout_landscape).isChecked = true } EmulationMenuSettings.LayoutOption_MobileLandscape -> {
4 -> { subMenu.findItem(R.id.menu_screen_layout_portrait).isChecked = true } subMenu.findItem(R.id.menu_screen_layout_landscape).isChecked = true
0 -> { subMenu.findItem(R.id.menu_screen_layout_auto).isChecked = true } }
EmulationMenuSettings.LayoutOption_MobilePortrait -> {
subMenu.findItem(R.id.menu_screen_layout_portrait).isChecked = true
}
EmulationMenuSettings.LayoutOption_Default -> {
subMenu.findItem(R.id.menu_screen_layout_auto).isChecked = true
}
else -> { subMenu.findItem(R.id.menu_screen_layout_landscape).isChecked = true } else -> { subMenu.findItem(R.id.menu_screen_layout_landscape).isChecked = true }
} }
} }
@ -334,19 +345,19 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
} }
R.id.menu_screen_layout_landscape -> { R.id.menu_screen_layout_landscape -> {
EmulationMenuSettings.screenLayout = 5 EmulationMenuSettings.screenLayout = EmulationMenuSettings.LayoutOption_MobileLandscape
updateScreenLayout() updateScreenLayout()
false false
} }
R.id.menu_screen_layout_portrait -> { R.id.menu_screen_layout_portrait -> {
EmulationMenuSettings.screenLayout = 4 EmulationMenuSettings.screenLayout = EmulationMenuSettings.LayoutOption_MobilePortrait
updateScreenLayout() updateScreenLayout()
false false
} }
R.id.menu_screen_layout_auto -> { R.id.menu_screen_layout_auto -> {
EmulationMenuSettings.screenLayout = 0 EmulationMenuSettings.screenLayout = EmulationMenuSettings.LayoutOption_Default
updateScreenLayout() updateScreenLayout()
false false
} }