floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PhraseEditorUI // Remove redrawTrigger, using alternative methods instead.

This commit is contained in:
ShikiSuen 2022-12-08 15:34:43 +08:00
parent 59903995ce
commit 7943ae9992
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Packages/vChewing_PhraseEditorUI/Sources/PhraseEditorUI/PhraseEditorUI.swift
View File

@ -44,7 +44,6 @@ public struct VwrPhraseEditorUI: View {
@State public var selUserDataType: vChewingLM.ReplacableUserDataType = .thePhrases @State public var selUserDataType: vChewingLM.ReplacableUserDataType = .thePhrases
@State private var isLoading = false @State private var isLoading = false
@State private var isSaved = false @State private var isSaved = false
@State private var redrawTrigger = false
public var currentIMEInputMode: Shared.InputMode { public var currentIMEInputMode: Shared.InputMode {
delegate?.currentInputMode ?? selInputMode delegate?.currentInputMode ?? selInputMode
@ -76,12 +75,10 @@ public struct VwrPhraseEditorUI: View {
guard let delegate = delegate else { return } guard let delegate = delegate else { return }
updateLabels() updateLabels()
clearAllFields() clearAllFields()
isLoading = true
txtContent = NSLocalizedString("Loading…", comment: "") txtContent = NSLocalizedString("Loading…", comment: "")
redrawTrigger.toggle() isLoading = true
DispatchQueue.main.async { DispatchQueue.main.async {
txtContent = delegate.retrieveData(mode: selInputMode, type: selUserDataType) txtContent = delegate.retrieveData(mode: selInputMode, type: selUserDataType)
redrawTrigger.toggle()
isSaved = true isSaved = true
isLoading = false isLoading = false
} }
@ -166,12 +163,10 @@ public struct VwrPhraseEditorUI: View {
private func saveAndReload() { private func saveAndReload() {
guard let delegate = delegate, selInputMode != .imeModeNULL, !isSaved else { return } guard let delegate = delegate, selInputMode != .imeModeNULL, !isSaved else { return }
let toSave = txtContent let toSave = txtContent
isLoading = true
txtContent = NSLocalizedString("Loading…", comment: "") txtContent = NSLocalizedString("Loading…", comment: "")
redrawTrigger.toggle() isLoading = true
let newResult = delegate.saveData(mode: selInputMode, type: selUserDataType, data: toSave) let newResult = delegate.saveData(mode: selInputMode, type: selUserDataType, data: toSave)
txtContent = newResult txtContent = newResult
redrawTrigger.toggle()
isLoading = false isLoading = false
isSaved = true isSaved = true
} }
@ -302,7 +297,6 @@ public struct VwrPhraseEditorUI: View {
selInputMode = .imeModeNULL selInputMode = .imeModeNULL
selUserDataType = .thePhrases selUserDataType = .thePhrases
txtContent = NSLocalizedString("Please select Simplified / Traditional Chinese mode above.", comment: "") txtContent = NSLocalizedString("Please select Simplified / Traditional Chinese mode above.", comment: "")
redrawTrigger.toggle()
}.onAppear { }.onAppear {
guard let delegate = delegate else { return } guard let delegate = delegate else { return }
selInputMode = delegate.currentInputMode selInputMode = delegate.currentInputMode