MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SvgRenderer — test should be not failed if icon not found

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-05-07 14:30:12 +02:00
parent 79be48036c
commit 413accdae6
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/util/ui/LafIconLookup.kt
+6 -2
View File
@@ -12,6 +12,11 @@ object LafIconLookup {
@JvmStatic
@JvmOverloads
fun getIcon(name: String, selected: Boolean = false, focused: Boolean = false, enabled: Boolean = true, editable: Boolean = false, pressed: Boolean = false): Icon {
return findIcon(name, selected = selected, focused = focused, enabled = enabled, editable = editable, pressed = pressed, isThrowErrorIfNotFound = true)
?: AllIcons.Actions.Stub
}
fun findIcon(name: String, selected: Boolean = false, focused: Boolean = false, enabled: Boolean = true, editable: Boolean = false, pressed: Boolean = false, isThrowErrorIfNotFound: Boolean = false): Icon? {
var key = name
if (editable) key += "Editable"
if (selected) key += "Selected"
@@ -32,8 +37,7 @@ object LafIconLookup {
}
key = dir + key
return IconLoader.findIcon("/com/intellij/ide/ui/laf/icons/$key.png", LafIconLookup::class.java, true) ?: AllIcons.Actions.Stub
return IconLoader.findIcon("/com/intellij/ide/ui/laf/icons/$key.png", LafIconLookup::class.java, true, isThrowErrorIfNotFound)
}
@JvmStatic
platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt
+3 -3
View File
@@ -58,15 +58,15 @@ internal class SvgRenderer(val svgFileDir: Path, private val deviceConfiguration
for (name in arrayOf("checkBox", "radio", "gear", "spinnerRight")) {
val iconWrapper = when (name) {
"gear" -> IconLoader.getIcon("/general/gear.png")
else -> LafIconLookup.getIcon(name)
}
else -> LafIconLookup.findIcon(name)
} ?: continue
if (isImage(iconWrapper)) {
return getIconRelativePath(iconWrapper.toString())
}
}
for (name in arrayOf("checkBox", "radio")) {
val iconWrapper = LafIconLookup.getIcon(name, selected = true)
val iconWrapper = LafIconLookup.findIcon(name, selected = true) ?: continue
if (isImage(iconWrapper)) {
return getIconRelativePath(iconWrapper.toString())
}