Skip to content

Commit 9afa2a5

Browse files
committed
fix for canvas init.
1 parent 604c2c4 commit 9afa2a5

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

app/src/main/java/com/ethran/notable/editor/EditorView.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ fun EditorView(
137137
// Initialize ViewModel with persisted settings on first composition
138138
LaunchedEffect(Unit) {
139139
viewModel.initFromPersistedSettings(editorSettingCacheManager.getEditorSettings())
140+
viewModel.updateDrawingState()
140141
}
141142

142143
val editorControlTower = remember {

app/src/main/java/com/ethran/notable/editor/EditorViewModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.ethran.notable.data.datastore.GlobalAppSettings
1313
import com.ethran.notable.data.db.getPageIndex
1414
import com.ethran.notable.data.db.getParentFolder
1515
import com.ethran.notable.data.model.BackgroundType
16+
import com.ethran.notable.editor.EditorViewModel.Companion.DEFAULT_PEN_SETTINGS
1617
import com.ethran.notable.editor.canvas.CanvasEventBus
1718
import com.ethran.notable.editor.state.Mode
1819
import com.ethran.notable.editor.state.SelectionState
@@ -71,7 +72,8 @@ data class ToolbarUiState(
7172
val mode: Mode = Mode.Draw,
7273
val pen: Pen = Pen.BALLPEN,
7374
val eraser: Eraser = Eraser.PEN,
74-
val penSettings: Map<String, PenSetting> = emptyMap(),
75+
// TODO: if it is an emptyMap(), the DrawCanvas crashes, to be fixed.
76+
val penSettings: Map<String, PenSetting> = DEFAULT_PEN_SETTINGS,
7577
val isSelectionActive: Boolean = false,
7678
val hasClipboard: Boolean = false,
7779
val isDrawing: Boolean = true,

0 commit comments

Comments
 (0)