Merge pull request #214 from amosproj/gui/fix/path-state-no-rerender

fixed setting of file picker paths in state to not rerender
amosproj · Jan 17, 2024 · edf85f4 · edf85f4
2 parents dc9c37f + 3b344ba
commit edf85f4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/GUI/src/main/kotlin/ui/components/diffScreen/SaveCollageButton.kt b/GUI/src/main/kotlin/ui/components/diffScreen/SaveCollageButton.kt
@@ -51,6 +51,6 @@ fun saveCollageCallback(
     if (!savePath.endsWith(".png")) {
         savePath = "$savePath.png"
     }
-    state.value = state.value.copy(saveCollagePath = savePath)
+    state.value.saveCollagePath = savePath
     navigator.createCollage(savePath)
 }
diff --git a/GUI/src/main/kotlin/ui/components/diffScreen/SaveInsertedFramesButton.kt b/GUI/src/main/kotlin/ui/components/diffScreen/SaveInsertedFramesButton.kt
@@ -65,7 +65,7 @@ fun saveInsertedFramesCallback(
             return
         }
     }
-    state.value = state.value.copy(saveInsertionsPath = savePath)
+    state.value.saveInsertionsPath = savePath
 
     createInsertionsExport(savePath, navigator.getInsertedFrames())
 }

diff --git a/GUI/src/main/kotlin/ui/components/general/ProjectManager.kt b/GUI/src/main/kotlin/ui/components/general/ProjectManager.kt
@@ -84,7 +84,7 @@ fun handleOpenProject(
 ) {
     val file = File(path).readLines()
     state.value = JsonMapper.mapper.readValue<AppState>(file.joinToString(""))
-    state.value = state.value.copy(openProjectPath = path)
+    state.value.openProjectPath = path
 }
 
 /**
@@ -100,7 +100,8 @@ fun handleSaveProject(
     if (!savePath.endsWith(".json")) {
         savePath = "$savePath.json"
     }
-    state.value = state.value.copy(saveProjectPath = savePath)
+    state.value.saveProjectPath = savePath
+
     val jsonData = JsonMapper.mapper.writeValueAsString(state.value)
     File(savePath).writeText(jsonData)
 }
diff --git a/GUI/src/main/kotlin/ui/components/general/SaveableImage.kt b/GUI/src/main/kotlin/ui/components/general/SaveableImage.kt
@@ -109,7 +109,7 @@ private fun saveBitmapAsPng(
         savePath = "$savePath.png"
     }
     // remember path for next time opening the file chooser
-    state.value = state.value.copy(saveFramePath = savePath)
+    state.value.saveFramePath = savePath
     val file = File(savePath)
     if (file.exists()) {
         val overwrite = showOverwriteConfirmation()