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 +9 -3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33402c0fcb - Show all commits

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

@ -110,9 +110,15 @@ internal class EntryCell(private val resources: ResourceBundle, private val conf
) )
) )
val definition = entry.cedictDefinitions.joinToString( val definition = when {
entry.cedictDefinitions.isNotEmpty() -> entry.cedictDefinitions.joinToString(
separator = " / " separator = " / "
) { it.joinToString(separator = "; ") } ) { it.joinToString(separator = "; ") }
entry.crossStraitsDefinitions.isNotEmpty() -> entry.crossStraitsDefinitions.joinToString(separator = " / ") { it.definition }
entry.moedictDefinitions.isNotEmpty() -> entry.moedictDefinitions.joinToString(separator = " / ") { it.definition }
else -> error("No definition for entry")
}
labelDefinition.text = definition labelDefinition.text = definition
contextMenu = createContextMenuForEntry(entry, resources) contextMenu = createContextMenuForEntry(entry, resources)