Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
sdercolin committed Oct 19, 2024
2 parents 0c1ad24 + 456d2c2 commit b8df34c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.material.MaterialTheme
import androidx.compose.material.SnackbarHostState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.key
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import com.sdercolin.vlabeler.model.Plugin
Expand Down Expand Up @@ -73,7 +74,9 @@ fun App(
initialFile = screen.initialFile,
)

is Screen.Editor -> Editor(screen.state, appState)
is Screen.Editor -> key(screen.state) {
Editor(screen.state, appState)
}
}
if (appState.isShowingProjectSettingDialog) {
ProjectSettingDialog(appState, finish = { appState.closeProjectSettingDialog() })
Expand Down

0 comments on commit b8df34c

Please sign in to comment.