example: Opt FPSMonitor

miuix-kotlin-multiplatform · Oct 11, 2024 · 6bad027 · 6bad027
1 parent a81392e
commit 6bad027
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/composeApp/src/commonMain/kotlin/UITest.kt b/composeApp/src/commonMain/kotlin/UITest.kt
@@ -82,7 +82,7 @@ fun UITest(
         }
     }
 
-    val showFPSMonitor = remember { mutableStateOf(false) }
+    val showFPSMonitor = remember { mutableStateOf(true) }
     val showTopAppBar = remember { mutableStateOf(true) }
     val showBottomBar = remember { mutableStateOf(true) }
     val showFloatingActionButton = remember { mutableStateOf(true) }
@@ -165,7 +165,7 @@ fun UITest(
         FPSMonitor(
             modifier = Modifier
                 .statusBarsPadding()
-                .padding(horizontal = 28.dp)
+                .padding(start = 28.dp, top = 18.dp)
         )
     }
 }

diff --git a/composeApp/src/commonMain/kotlin/utils/FPSMonitor.kt b/composeApp/src/commonMain/kotlin/utils/FPSMonitor.kt
@@ -19,14 +19,26 @@ import top.yukonga.miuix.kmp.basic.Text
 @Composable
 fun FPSMonitor(modifier: Modifier = Modifier) {
     var fps by remember { mutableStateOf(0) }
+    var maxFps by remember { mutableStateOf(0) }
     var lastFrameTime by remember { mutableStateOf(0L) }
     var frameCount by remember { mutableStateOf(0) }
     var totalFrameTime by remember { mutableStateOf(0L) }
 
+    if (fps > maxFps) {
+        maxFps = fps
+    }
+
+    val color = when {
+        fps >= maxFps - 2 -> Color.Green
+        fps >= maxFps - 6 -> Color.Blue
+        fps >= maxFps - 15 -> Color(0xFFFFD700)
+        else -> Color.Red
+    }
+
     Text(
         text = "FPS: $fps",
         modifier = modifier,
-        color = if (fps < 57) Color.Red else Color.Green
+        color = color
     )
 
     LaunchedEffect(Unit) {

diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDialog.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDialog.kt
@@ -72,8 +72,8 @@ fun SuperDialog(
 ) {
     val density = LocalDensity.current
     val getWindowSize by rememberUpdatedState(getWindowSize())
-    val windowWidth = getWindowSize.width.dp / density.density
-    val windowHeight = getWindowSize.height.dp / density.density
+    val windowWidth by rememberUpdatedState(getWindowSize.width.dp / density.density)
+    val windowHeight by rememberUpdatedState(getWindowSize.height.dp / density.density)
     val paddingModifier = remember(outsideMargin) { Modifier.padding(horizontal = outsideMargin.width).padding(bottom = outsideMargin.height) }
     val roundedCorner by rememberUpdatedState(getRoundedCorner())
     val bottomCornerRadius by remember { derivedStateOf { if (roundedCorner != 0.dp) roundedCorner - outsideMargin.width else 32.dp } }

diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.kt
@@ -117,8 +117,9 @@ fun SuperDropdown(
     val textMeasurer = rememberTextMeasurer()
     val textStyle = remember { TextStyle(fontWeight = FontWeight.Medium, fontSize = 17.sp) }
     val textWidthDp = remember(items) { items.maxOfOrNull { with(density) { textMeasurer.measure(text = it, style = textStyle).size.width.toDp() } } }
-    val windowWeightPx by rememberUpdatedState(getWindowSize().width)
-    val windowHeightPx by rememberUpdatedState(getWindowSize().height)
+    val getWindowSize = rememberUpdatedState(getWindowSize())
+    val windowWeightPx by rememberUpdatedState(getWindowSize.value.width)
+    val windowHeightPx by rememberUpdatedState(getWindowSize.value.height)
     var dropdownOffsetPx by remember { mutableStateOf(0) }
     var dropdownHeightPx by remember { mutableStateOf(0) }
     var componentHeightPx by remember { mutableStateOf(0) }