eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 2 Projects Releases 2 Packages Wiki Activity Actions

Slightly changed the overlay design

Browse source
This commit is contained in:
Pavel Barabanov 2025-03-30 16:54:52 +03:00 • committed by Briar
parent 875a0d7e4a
commit dfbdf448eb
1 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@ import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.os.PowerManager
import android.os.SystemClock import android.os.SystemClock
import android.util.Rational import android.util.Rational
import android.view.* import android.view.*
@ -87,8 +86,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
private var isInFoldableLayout = false private var isInFoldableLayout = false
private lateinit var powerManager: PowerManager
override fun onAttach(context: Context) { override fun onAttach(context: Context) {
super.onAttach(context) super.onAttach(context)
if (context is EmulationActivity) { if (context is EmulationActivity) {
@ -106,8 +103,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
updateOrientation() updateOrientation()
powerManager = requireContext().getSystemService(Context.POWER_SERVICE) as PowerManager
val intentUri: Uri? = requireActivity().intent.data val intentUri: Uri? = requireActivity().intent.data
var intentGame: Game? = null var intentGame: Game? = null
if (intentUri != null) { if (intentUri != null) {
@ -515,6 +510,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
@SuppressLint("DefaultLocale") @SuppressLint("DefaultLocale")
private fun updateShowFpsOverlay() { private fun updateShowFpsOverlay() {
val showOverlay = BooleanSetting.SHOW_PERFORMANCE_OVERLAY.getBoolean() val showOverlay = BooleanSetting.SHOW_PERFORMANCE_OVERLAY.getBoolean()
binding.showFpsText.setTextColor(Color.parseColor("#A146FF"))
binding.showFpsText.setVisible(showOverlay) binding.showFpsText.setVisible(showOverlay)
if (showOverlay) { if (showOverlay) {
val SYSTEM_FPS = 0 val SYSTEM_FPS = 0
@ -540,7 +536,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
if (_binding != null) { if (_binding != null) {
binding.showFpsText.text = String.format( binding.showFpsText.text = String.format(
"FPS: %.1f\nMEM: %d MB\n%s/%s", "%.1f FPS • %d MB • %s/%s",
perfStats[FPS], usedMegs, cpuBackend, gpuDriver perfStats[FPS], usedMegs, cpuBackend, gpuDriver
) )
} }
@ -571,25 +567,16 @@ private fun updateThermalOverlay(temperature: Float) {
emulationViewModel.emulationStarted.value && emulationViewModel.emulationStarted.value &&
!emulationViewModel.isEmulationStopping.value !emulationViewModel.isEmulationStopping.value
) { ) {
// Get thermal status for color
val thermalStatus = when (powerManager.currentThermalStatus) {
PowerManager.THERMAL_STATUS_NONE -> 0f
PowerManager.THERMAL_STATUS_LIGHT -> 0.25f
PowerManager.THERMAL_STATUS_MODERATE -> 0.5f
PowerManager.THERMAL_STATUS_SEVERE -> 0.75f
PowerManager.THERMAL_STATUS_CRITICAL,
PowerManager.THERMAL_STATUS_EMERGENCY,
PowerManager.THERMAL_STATUS_SHUTDOWN -> 1.0f
else -> 0f
}
// Convert to Fahrenheit // Convert to Fahrenheit
val fahrenheit = (temperature * 9f / 5f) + 32f val fahrenheit = (temperature * 9f / 5f) + 32f
// Color based on thermal status (green to red) // Determine color based on temperature ranges
val red = (thermalStatus * 255).toInt() val color = when {
val green = ((1f - thermalStatus) * 255).toInt() temperature < 35 -> Color.parseColor("#00C8FF")
val color = android.graphics.Color.rgb(red, green, 0) temperature < 40 -> Color.parseColor("#A146FF")
temperature < 45 -> Color.parseColor("#FFA500")
else -> Color.RED
}
binding.showThermalsText.setTextColor(color) binding.showThermalsText.setTextColor(color)
binding.showThermalsText.text = String.format("%.1f°C • %.1f°F", temperature, fahrenheit) binding.showThermalsText.text = String.format("%.1f°C • %.1f°F", temperature, fahrenheit)