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 76 commits from develop into main
pull from: develop
merge into: marvinelsen:main
Conversation 0 Commits 76 Files Changed 66 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 47d53d4df8 - Show all commits

5
src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt
View File

@ -44,15 +44,13 @@ internal class EntryCell : ListCell<DictionaryEntryFx?>() {
init { init {
text = null text = null
if (item != null) {
contextMenu = createContextMenuForEntry(item!!)
}
} }
override fun updateItem(entry: DictionaryEntryFx?, empty: Boolean) { override fun updateItem(entry: DictionaryEntryFx?, empty: Boolean) {
super.updateItem(entry, empty) super.updateItem(entry, empty)
if (empty || entry == null) { if (empty || entry == null) {
graphic = null graphic = null
contextMenu = null
} else { } else {
labelHeadword.text = entry.traditionalProperty.value labelHeadword.text = entry.traditionalProperty.value
labelPronunciation.text = entry.pinyinWithToneMarksProperty.value labelPronunciation.text = entry.pinyinWithToneMarksProperty.value
@ -60,6 +58,7 @@ internal class EntryCell : ListCell<DictionaryEntryFx?>() {
val definition = entry.definitions.joinToString(separator = " / ") { it.joinToString(separator = "; ") } val definition = entry.definitions.joinToString(separator = " / ") { it.joinToString(separator = "; ") }
labelDefinition.text = definition labelDefinition.text = definition
contextMenu = createContextMenuForEntry(entry)
graphic = root graphic = root
} }
} }