From 6fb6c6ffe4ed5457ccf191d282bc9073d1e42bc6 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 15 Aug 2018 20:08:01 +0200 Subject: [PATCH] update UI DSL test (new gear icons) --- .../mac/align fields in the nested grid.svg | 18 +++++++++--------- .../mac/align fields in the nested grid.yml | 4 ++-- .../mac/align fields in the nested grid.svg | 18 +++++++++--------- .../mac/align fields in the nested grid.yml | 4 ++-- .../testSrc/com/intellij/ui/SvgRenderer.kt | 5 +++-- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/platform/platform-tests/testData/ui/layout/Darcula/mac/align fields in the nested grid.svg b/platform/platform-tests/testData/ui/layout/Darcula/mac/align fields in the nested grid.svg index 309ce2724872..09fdee2f3e46 100644 --- a/platform/platform-tests/testData/ui/layout/Darcula/mac/align fields in the nested grid.svg +++ b/platform/platform-tests/testData/ui/layout/Darcula/mac/align fields in the nested grid.svg @@ -26,16 +26,16 @@ - + - + - + - + @@ -62,17 +62,17 @@ Master Password: - - + + - + - + - + Database: diff --git a/platform/platform-tests/testData/ui/layout/Darcula/mac/align fields in the nested grid.yml b/platform/platform-tests/testData/ui/layout/Darcula/mac/align fields in the nested grid.yml index 66bc99b687e5..2441b23c7497 100644 --- a/platform/platform-tests/testData/ui/layout/Darcula/mac/align fields in the nested grid.yml +++ b/platform/platform-tests/testData/ui/layout/Darcula/mac/align fields in the nested grid.yml @@ -73,8 +73,8 @@ cellBounds: componentBounds: In KeePass: [-2, -2, 90, 19] 'Database:': [23, 29, 61, 15] - 'JTextField #2': [134, 22, 324, 30] - 'JLabel #3': [459, 29, 21, 16] + 'JTextField #2': [134, 22, 329, 30] + 'JLabel #3': [464, 29, 16, 16] 'Master Password:': [23, 63, 108, 15] 'JBPasswordField #5': [134, 56, 256, 30] Stored using weak encryption.: [138, 89, 158, 13] diff --git a/platform/platform-tests/testData/ui/layout/IntelliJ/mac/align fields in the nested grid.svg b/platform/platform-tests/testData/ui/layout/IntelliJ/mac/align fields in the nested grid.svg index e2fde2212d2d..fbef82cc1f74 100644 --- a/platform/platform-tests/testData/ui/layout/IntelliJ/mac/align fields in the nested grid.svg +++ b/platform/platform-tests/testData/ui/layout/IntelliJ/mac/align fields in the nested grid.svg @@ -23,16 +23,16 @@ - + - + - + - + @@ -57,17 +57,17 @@ Master Password: - - + + - + - + - + Database: diff --git a/platform/platform-tests/testData/ui/layout/IntelliJ/mac/align fields in the nested grid.yml b/platform/platform-tests/testData/ui/layout/IntelliJ/mac/align fields in the nested grid.yml index a9f42ad57e76..1a67504ede44 100644 --- a/platform/platform-tests/testData/ui/layout/IntelliJ/mac/align fields in the nested grid.yml +++ b/platform/platform-tests/testData/ui/layout/IntelliJ/mac/align fields in the nested grid.yml @@ -73,8 +73,8 @@ cellBounds: componentBounds: In KeePass: [-3, -3, 92, 22] 'Database:': [26, 29, 61, 15] - 'JTextField #2': [137, 23, 321, 27] - 'JLabel #3': [459, 29, 21, 16] + 'JTextField #2': [137, 23, 326, 27] + 'JLabel #3': [464, 29, 16, 16] 'Master Password:': [26, 60, 108, 15] 'JBPasswordField #5': [137, 54, 256, 27] Stored using weak encryption.: [141, 84, 158, 13] diff --git a/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt b/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt index 9bcc75b659e9..381bcb9e9e7b 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt +++ b/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt @@ -55,9 +55,9 @@ internal class SvgRenderer(val svgFileDir: Path, private val deviceConfiguration return thatImage === image } - for (name in arrayOf("checkBox", "radio", "gear", "spinnerRight")) { + for (name in arrayOf("checkBox", "radio", "gear.png", "gearPlain.png", "gearPlain.svg", "spinnerRight")) { val iconWrapper = when (name) { - "gear" -> IconLoader.getIcon("/general/gear.png") + "gear.png", "gearPlain.png", "gearPlain.svg" -> IconLoader.getIcon("/general/$name") else -> LafIconLookup.findIcon(name) } ?: continue @@ -117,6 +117,7 @@ internal class SvgRenderer(val svgFileDir: Path, private val deviceConfiguration writer.use { val root = svgGenerator.root root.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns", SVGSyntax.SVG_NAMESPACE_URI) + @Suppress("SpellCheckingInspection") root.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink") root.setAttributeNS(null, "viewBox", "0 0 ${component.width} ${component.height}")