marvinelsen/willow
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

New Features #1

Open
marvinelsen wants to merge 95 commits from develop into main
pull from: develop
merge into: marvinelsen:main
Conversation 0 Commits 95 Files Changed 68 +19 -7
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5baccc4b3f - Show all commits

7
src/main/kotlin/com/marvinelsen/willow/Model.kt
View File

@ -142,7 +142,7 @@ class Model(
}
}
fun selectEntry(entry: DictionaryEntry) {
fun deepDive(entry: DictionaryEntry) {
undoManager.execute(object : Command {
private val previouslySelectedEntry = internalSelectedEntry.value
@ -158,6 +158,11 @@ class Model(
})
}
fun normalSelect(entry: DictionaryEntry) {
undoManager.reset()
select(entry)
}
private fun select(entry: DictionaryEntry) {
internalFinishedFindingCharacters.value = false
internalFinishedFindingWordsBeginning.value = false

6
src/main/kotlin/com/marvinelsen/willow/ui/controllers/DetailsController.kt
View File

@ -207,7 +207,7 @@ class DetailsController(
selectionModel.selectedItemProperty().addListener { _, _, newEntry ->
if (newEntry == null) return@addListener
model.selectEntry(newEntry)
model.deepDive(newEntry)
}
}
progressIndicatorWordsContaining.visibleProperty().bind(model.isFindingWordsContaining)
@ -225,7 +225,7 @@ class DetailsController(
selectionModel.selectedItemProperty().addListener { _, _, newEntry ->
if (newEntry == null) return@addListener
model.selectEntry(newEntry)
model.deepDive(newEntry)
}
}
progressIndicatorWordsBeginning.visibleProperty().bind(model.isFindingWordsBeginning)
@ -243,7 +243,7 @@ class DetailsController(
selectionModel.selectedItemProperty().addListener { _, _, newEntry ->
if (newEntry == null) return@addListener
model.selectEntry(newEntry)
model.deepDive(newEntry)
}
}
progressIndicatorCharacters.visibleProperty().bind(model.isFindingCharacters)

2
src/main/kotlin/com/marvinelsen/willow/ui/controllers/SearchResultsController.kt
View File

@ -49,7 +49,7 @@ class SearchResultsController(
if (newValue == null) {
return@addListener
}
model.selectEntry(newValue)
model.normalSelect(newValue)
}
}
}

11
src/main/kotlin/com/marvinelsen/willow/ui/undo/UndoManager.kt
View File

@ -15,7 +15,7 @@ class UndoManager {
undoStack.push(command).execute()
canUndoProperty.value = undoStack.size > 1
canUndoProperty.value = !undoStack.isEmpty()
canRedoProperty.value = false
}
@ -24,7 +24,7 @@ class UndoManager {
redoStack.push(undoStack.pop()).undo()
canUndoProperty.value = undoStack.size > 1
canUndoProperty.value = !undoStack.isEmpty()
canRedoProperty.value = true
}
@ -36,4 +36,11 @@ class UndoManager {
canUndoProperty.value = true
canRedoProperty.value = !redoStack.isEmpty()
}
fun reset() {
undoStack.clear()
redoStack.clear()
canUndoProperty.value = false
canRedoProperty.value = false
}
}