mirror of
https://github.com/RyzenDew/Lime-3DS-Emulator.git
synced 2024-06-02 15:38:50 +02:00
Merge 1536cb53d4
into 6e7cc65ec4
This commit is contained in:
commit
9afcbba222
|
@ -20,6 +20,7 @@ import android.view.Surface
|
|||
import android.view.SurfaceHolder
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.content.res.Configuration;
|
||||
import android.widget.PopupMenu
|
||||
import android.widget.TextView
|
||||
import android.widget.Toast
|
||||
|
@ -36,6 +37,7 @@ import androidx.fragment.app.viewModels
|
|||
import androidx.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.lifecycle.repeatOnLifecycle
|
||||
import android.content.pm.ActivityInfo
|
||||
import androidx.navigation.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import androidx.preference.PreferenceManager
|
||||
|
@ -255,6 +257,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
|
|||
true
|
||||
}
|
||||
|
||||
R.id.menu_rotate_screen -> {
|
||||
rotateScreen()
|
||||
true
|
||||
}
|
||||
|
||||
R.id.menu_amiibo -> {
|
||||
showAmiiboMenu()
|
||||
true
|
||||
|
@ -412,6 +419,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
|
|||
setInsets()
|
||||
}
|
||||
|
||||
private fun rotateScreen() {
|
||||
if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
|
||||
(context as? EmulationActivity)?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
|
||||
} else if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
|
||||
(context as? EmulationActivity)?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
||||
} else {
|
||||
(context as? EmulationActivity)?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
private fun togglePause() {
|
||||
if(emulationState.isPaused) {
|
||||
emulationState.unpause()
|
||||
|
|
|
@ -17,6 +17,11 @@
|
|||
android:icon="@drawable/ic_controller"
|
||||
android:title="@string/emulation_overlay_options" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_rotate_screen"
|
||||
android:icon="@drawable/ic_fit_screen"
|
||||
android:title="@string/emulation_rotate_screen" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_amiibo"
|
||||
android:icon="@drawable/ic_nfc"
|
||||
|
|
|
@ -313,6 +313,7 @@ Se esperan fallos gráficos temporales cuando ésta esté activado.</string>
|
|||
<string name="emulation_configure_controls">Configurar Controles</string>
|
||||
<string name="emulation_edit_layout">Editar Estilo</string>
|
||||
<string name="emulation_done">Hecho</string>
|
||||
<string name="emulation_rotate_screen">Rotar Pantalla</string>
|
||||
<string name="emulation_toggle_controls">Activar Controles</string>
|
||||
<string name="emulation_control_scale">Ajustar Escala</string>
|
||||
<string name="emulation_control_opacity">Ajustar Opacidad</string>
|
||||
|
|
|
@ -339,6 +339,7 @@
|
|||
<string name="emulation_configure_controls">Configure Controls</string>
|
||||
<string name="emulation_edit_layout">Edit Layout</string>
|
||||
<string name="emulation_done">Done</string>
|
||||
<string name="emulation_rotate_screen">Rotate Screen</string>
|
||||
<string name="emulation_toggle_controls">Toggle Controls</string>
|
||||
<string name="emulation_control_scale">Adjust Scale</string>
|
||||
<string name="emulation_control_scale_global">Global Scale</string>
|
||||
|
|
Loading…
Reference in New Issue
Block a user