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

UI DSL - correct gaps and input fields size on Windows Darcula LaF

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-04-08 08:57:26 +02:00
parent 22befdf929
commit caed536a66
19 changed files with 375 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+4
View File
@@ -456,6 +456,10 @@ public class AppUIUtil {
public static void targetToDevice(@NotNull Component comp, @Nullable Component target) {
if (comp.isShowing()) return;
GraphicsConfiguration gc = target != null ? target.getGraphicsConfiguration() : null;
setGraphicsConfiguration(comp, gc);
}
public static void setGraphicsConfiguration(@NotNull Component comp, @Nullable GraphicsConfiguration gc) {
AWTAccessor.getComponentAccessor().setGraphicsConfiguration(comp, gc);
}
}
platform/platform-impl/src/com/intellij/ui/layout/SpacingConfiguration.kt
+1 -1
View File
@@ -19,7 +19,7 @@ fun createIntelliJSpacingConfiguration(): SpacingConfiguration {
return object : SpacingConfiguration {
override val labelColumnVerticalTopGap = JBUI.scale(labelColumnVerticalTopGap)
override val isCompensateVisualPaddings = SystemInfoRt.isMac || isUnderWin10LookAndFeel
override val isCompensateVisualPaddings = !SystemInfoRt.isLinux
override val horizontalGap = JBUI.scale(8)
override val verticalGap = JBUI.scale(5 * 2)
platform/platform-tests/testData/ui/layout/Darcula/align fields in the nested grid.yml
+16 -17
View File
@@ -12,7 +12,6 @@ layoutConstraints:
- {horizontal: true, unit: 0, value: 0.0}
- {horizontal: false, unit: 0, value: 0.0}
- {horizontal: true, unit: 0, value: 0.0}
visualPadding: false
rowConstraints:
constraints:
- align: {horizontal: false, unit: 6, value: 0.0}
@@ -41,7 +40,7 @@ componentConstrains:
'Database:':
horizontal:
gapBefore:
min: &id006 {horizontal: true, value: 23.0}
min: &id006 {horizontal: true, value: 21.0}
preferred: *id006
vertical:
gapBefore:
@@ -61,7 +60,7 @@ componentConstrains:
'Master Password:':
horizontal:
gapBefore:
min: &id009 {horizontal: true, value: 23.0}
min: &id009 {horizontal: true, value: 21.0}
preferred: *id009
vertical:
gapBefore:
@@ -78,18 +77,18 @@ componentConstrains:
spanX: 2097051
wrap: true
cellBounds:
- [0, 0, 480, 23]
- [0, 33, 115, 32]
- [121, 33, 351, 32]
- [121, 33, 351, 32]
- [0, 75, 115, 30]
- [121, 75, 359, 30]
- [121, 111, 359, 16]
- [0, 0, 480, 24]
- [0, 34, 113, 24]
- [119, 34, 353, 24]
- [119, 34, 353, 24]
- [0, 68, 113, 25]
- [119, 68, 361, 25]
- [119, 99, 361, 16]
componentBounds:
In KeePass: [0, 0, 78, 23]
'Database:': [23, 41, 51, 16]
'JTextField #2': [121, 33, 326, 32]
'JLabel #3': [451, 41, 21, 16]
'Master Password:': [23, 81, 92, 16]
'JBPasswordField #5': [121, 75, 250, 30]
Stored using weak encryption.: [122, 111, 159, 16]
In KeePass: [-2, 0, 78, 24]
'Database:': [21, 38, 51, 16]
'JTextField #2': [117, 32, 332, 28]
'JLabel #3': [451, 38, 21, 16]
'Master Password:': [21, 72, 92, 16]
'JBPasswordField #5': [117, 67, 254, 28]
Stored using weak encryption.: [120, 99, 159, 16]
platform/platform-tests/testData/ui/layout/Darcula/align fields.yml
+6 -7
View File
@@ -12,7 +12,6 @@ layoutConstraints:
- {horizontal: true, unit: 0, value: 0.0}
- {horizontal: false, unit: 0, value: 0.0}
- {horizontal: true, unit: 0, value: 0.0}
visualPadding: false
rowConstraints:
constraints:
- align: {horizontal: false, unit: 6, value: 0.0}
@@ -47,11 +46,11 @@ componentConstrains:
spanX: 2097051
wrap: true
cellBounds:
- [0, 0, 124, 22]
- [130, 0, 350, 22]
- [0, 32, 124, 32]
- [130, 32, 350, 32]
- [0, 0, 124, 24]
- [130, 0, 350, 24]
- [0, 34, 124, 24]
- [130, 34, 350, 24]
componentBounds:
Create Android module: [0, 4, 124, 16]
'Android module name:': [0, 36, 123, 16]
'JTextField #3': [130, 32, 350, 32]
'Android module name:': [0, 38, 123, 16]
'JTextField #3': [128, 32, 354, 28]
platform/platform-tests/testData/ui/layout/Darcula/cell.yml
+10 -11
View File
@@ -12,7 +12,6 @@ layoutConstraints:
- {horizontal: true, unit: 0, value: 0.0}
- {horizontal: false, unit: 0, value: 0.0}
- {horizontal: true, unit: 0, value: 0.0}
visualPadding: false
rowConstraints:
constraints:
- align: {horizontal: false, unit: 6, value: 0.0}
@@ -53,7 +52,7 @@ componentConstrains:
Use File -> Settings Repository... to configure:
horizontal:
gapBefore:
min: &id008 {horizontal: true, value: 4.0}
min: &id008 {horizontal: true, value: 1.0}
preferred: *id008
skip: 1
spanX: 2097051
@@ -65,14 +64,14 @@ componentConstrains:
vertical: {grow: 100.0}
wrap: true
cellBounds:
- [0, 0, 59, 30]
- [65, 0, 407, 30]
- [65, 0, 407, 30]
- [65, 36, 415, 16]
- [0, 62, 480, 248]
- [0, 0, 59, 24]
- [65, 0, 407, 24]
- [65, 0, 407, 24]
- [65, 30, 415, 16]
- [0, 56, 480, 254]
componentBounds:
'Repository:': [0, 4, 59, 16]
'ComboBox #1': [65, 0, 41, 30]
Delete: [114, 0, 78, 30]
Use File -> Settings Repository... to configure: [69, 36, 237, 16]
'JBScrollPane #4': [0, 62, 480, 248]
'ComboBox #1': [62, -3, 41, 30]
Delete: [105, -3, 78, 30]
Use File -> Settings Repository... to configure: [66, 30, 237, 16]
'JBScrollPane #4': [0, 56, 480, 254]
platform/platform-tests/testData/ui/layout/Darcula/note row in the dialog.yml
+8 -9
View File
@@ -12,7 +12,6 @@ layoutConstraints:
- {horizontal: true, unit: 0, value: 0.0}
- {horizontal: false, unit: 0, value: 0.0}
- {horizontal: true, unit: 0, value: 0.0}
visualPadding: false
rowConstraints:
constraints:
- align: {horizontal: false, unit: 6, value: 0.0}
@@ -65,14 +64,14 @@ componentConstrains:
wrap: true
cellBounds:
- [0, 0, 480, 62]
- [0, 72, 83, 30]
- [89, 72, 391, 30]
- [89, 112, 391, 22]
- [0, 144, 480, 52]
- [0, 72, 83, 25]
- [89, 72, 391, 25]
- [89, 107, 391, 24]
- [0, 141, 480, 52]
componentBounds:
Profiler requires access to the kernel-level API. Enter the sudo password to allow this.: [
0, 10, 242, 32]
'Sudo password:': [0, 78, 83, 16]
'JPasswordField #2': [89, 72, 250, 30]
!!binary "G1JlbWVtYmVy": [89, 112, 89, 22]
'SimpleColoredComponent #4': [0, 156, 271, 20]
'Sudo password:': [0, 76, 83, 16]
'JPasswordField #2': [87, 71, 254, 28]
!!binary "G1JlbWVtYmVy": [87, 107, 89, 24]
'SimpleColoredComponent #4': [0, 153, 271, 20]
platform/platform-tests/testData/ui/layout/Darcula/visual paddings.yml
+53 -54
View File
@@ -12,7 +12,6 @@ layoutConstraints:
- {horizontal: true, unit: 0, value: 0.0}
- {horizontal: false, unit: 0, value: 0.0}
- {horizontal: true, unit: 0, value: 0.0}
visualPadding: false
rowConstraints:
constraints:
- align: {horizontal: false, unit: 6, value: 0.0}
@@ -151,7 +150,7 @@ componentConstrains:
'Scroll pane:':
vertical:
gapBefore:
max: &id021 {horizontal: false, value: 4.0}
max: &id021 {horizontal: false, value: 1.0}
min: *id021
preferred: *id021
'JBScrollPane #26':
@@ -161,57 +160,57 @@ componentConstrains:
vertical: {grow: 100.0}
wrap: true
cellBounds:
- [0, 0, 108, 32]
- [114, 0, 529, 32]
- [0, 42, 108, 30]
- [114, 42, 529, 30]
- [0, 82, 108, 30]
- [114, 82, 529, 30]
- [0, 122, 108, 30]
- [114, 122, 529, 30]
- [0, 162, 108, 30]
- [114, 162, 529, 30]
- [0, 202, 108, 22]
- [114, 202, 529, 22]
- [0, 234, 108, 23]
- [114, 234, 529, 23]
- [0, 267, 108, 30]
- [114, 267, 529, 30]
- [0, 307, 108, 30]
- [114, 307, 529, 30]
- [0, 347, 108, 32]
- [114, 347, 521, 32]
- [114, 347, 521, 32]
- [114, 347, 521, 32]
- [114, 347, 521, 32]
- [114, 347, 521, 32]
- [114, 347, 521, 32]
- [0, 389, 108, 20]
- [114, 389, 529, 20]
- [0, 0, 108, 24]
- [114, 0, 509, 24]
- [0, 34, 108, 24]
- [114, 34, 509, 24]
- [0, 68, 108, 24]
- [114, 68, 509, 24]
- [0, 102, 108, 24]
- [114, 102, 509, 24]
- [0, 136, 108, 24]
- [114, 136, 509, 24]
- [0, 170, 108, 24]
- [114, 170, 509, 24]
- [0, 204, 108, 24]
- [114, 204, 509, 24]
- [0, 238, 108, 24]
- [114, 238, 509, 24]
- [0, 272, 108, 24]
- [114, 272, 509, 24]
- [0, 306, 108, 24]
- [114, 306, 501, 24]
- [114, 306, 501, 24]
- [114, 306, 501, 24]
- [114, 306, 501, 24]
- [114, 306, 501, 24]
- [114, 306, 501, 24]
- [0, 340, 108, 20]
- [114, 340, 509, 20]
componentBounds:
'Text field:': [0, 4, 51, 16]
'JTextField #1': [114, 0, 529, 32]
'Password:': [0, 46, 53, 16]
'JPasswordField #3': [114, 42, 250, 30]
'Combobox:': [0, 86, 63, 16]
'JComboBox #5': [114, 82, 529, 30]
'Combobox Editable:': [0, 126, 108, 16]
'JComboBox #7': [114, 122, 529, 30]
'Button:': [0, 166, 39, 16]
label: [114, 234, 48, 23]
'CheckBox:': [0, 206, 56, 16]
enabled: [114, 202, 65, 22]
'RadioButton:': [0, 238, 69, 16]
'Spinner:': [0, 271, 43, 16]
'JBIntSpinner #15': [114, 267, 72, 30]
'Text with browse:': [0, 311, 92, 16]
'TextFieldWithHistoryWithBrowseButton #17': [114, 307, 529, 30]
'All:': [0, 351, 17, 16]
'JTextField #19': [114, 347, 40, 32]
'JPasswordField #20': [162, 347, 250, 30]
'JComboBox #21': [420, 347, 50, 30]
b: [478, 347, 78, 30]
c: [564, 347, 29, 22]
rb: [601, 347, 34, 23]
'Scroll pane:': [0, 393, 61, 16]
'JBScrollPane #26': [114, 389, 529, 20]
'JTextField #1': [112, -2, 513, 28]
'Password:': [0, 38, 53, 16]
'JPasswordField #3': [112, 32, 254, 28]
'Combobox:': [0, 72, 63, 16]
'JComboBox #5': [111, 65, 515, 30]
'Combobox Editable:': [0, 106, 108, 16]
'JComboBox #7': [111, 99, 515, 30]
'Button:': [0, 140, 39, 16]
label: [112, 204, 48, 24]
'CheckBox:': [0, 174, 56, 16]
enabled: [112, 170, 65, 24]
'RadioButton:': [0, 208, 69, 16]
'Spinner:': [0, 242, 43, 16]
'JBIntSpinner #15': [111, 235, 72, 30]
'Text with browse:': [0, 276, 92, 16]
'TextFieldWithHistoryWithBrowseButton #17': [111, 269, 515, 30]
'All:': [0, 310, 17, 16]
'JTextField #19': [112, 304, 40, 28]
'JPasswordField #20': [156, 304, 254, 28]
'JComboBox #21': [413, 303, 50, 30]
b: [465, 303, 78, 30]
c: [546, 306, 29, 24]
rb: [581, 306, 34, 24]
'Scroll pane:': [0, 341, 61, 16]
'JBScrollPane #26': [114, 340, 509, 20]
platform/platform-tests/testData/ui/layout/Darcula/win/align fields in the nested grid.svg
+27 -27
View File
@@ -11,13 +11,13 @@
<path d="M0 0 L0 16 L159 16 L159 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
<path d="M0 0 L0 30 L250 30 L250 0 Z"/>
<path d="M0 0 L0 28 L254 28 L254 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
<path d="M-1 -1 L-1 29 L249 29 L249 -1 Z"/>
<path d="M-1 -1 L-1 27 L253 27 L253 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
<path d="M0 0 L0 20 L242 20 L242 0 Z"/>
<path d="M0 0 L0 24 L246 24 L246 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
<path d="M0 0 L0 16 L92 16 L92 0 Z"/>
@@ -26,56 +26,56 @@
<path d="M0 0 L0 16 L21 16 L21 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">
<path d="M0 0 L0 32 L326 32 L326 0 Z"/>
<path d="M0 0 L0 28 L332 28 L332 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">
<path d="M-1 -1 L-1 31 L325 31 L325 -1 Z"/>
<path d="M-1 -1 L-1 27 L331 27 L331 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">
<path d="M0 0 L0 16 L51 16 L51 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">
<path d="M0 0 L0 23 L78 23 L78 0 Z"/>
<path d="M2 0 L2 24 L78 24 L78 0 Z"/>
</clipPath>
</defs>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" stroke="rgb(60,63,65)">
<rect x="0" width="480" height="320" y="0" clip-path="url(#clipPath1)" stroke="none"/>
</g>
<g fill="rgb(120,120,120)" text-rendering="geometricPrecision" font-family="'Segoe UI'" transform="translate(122,111)" stroke="rgb(120,120,120)">
<g fill="rgb(120,120,120)" text-rendering="geometricPrecision" font-family="'Segoe UI'" transform="translate(120,99)" stroke="rgb(120,120,120)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath2)" stroke="none">Stored using weak encryption.</text>
</g>
<g fill="rgb(60,63,65)" font-family="monospace" transform="translate(121,75)" stroke="rgb(60,63,65)">
<rect x="0" width="250" height="30" y="0" clip-path="url(#clipPath3)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="monospace" transform="translate(117,67)" stroke="rgb(60,63,65)">
<rect x="0" width="254" height="28" y="0" clip-path="url(#clipPath3)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(122,76)" stroke="rgb(69,73,74)">
<rect x="2" width="244" height="24" y="2" clip-path="url(#clipPath4)" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(118,68)" stroke="rgb(69,73,74)">
<rect x="2" width="248" height="22" y="2" clip-path="url(#clipPath4)" stroke="none"/>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(122,76)" stroke="rgb(100,100,100)">
<path d="M2 2 L246 2 L246 26 L2 26 L2 2 ZM3 3 L245 3 L245 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath4)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(117,67)" stroke="rgb(100,100,100)">
<path d="M2 2 L252 2 L252 26 L2 26 L2 2 ZM3 3 L251 3 L251 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath3)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(23,81)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(21,72)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath6)" stroke="none">Master Password:</text>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(451,41)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(451,38)" stroke="rgb(187,187,187)">
<image x="0" y="0" clip-path="url(#clipPath7)" width="21" xlink:href="../../../../../../icons/general/gear.png" height="16" preserveAspectRatio="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(121,33)" stroke="rgb(60,63,65)">
<rect x="0" width="326" height="32" y="0" clip-path="url(#clipPath8)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(117,32)" stroke="rgb(60,63,65)">
<rect x="0" width="332" height="28" y="0" clip-path="url(#clipPath8)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(122,34)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath9)" width="320" rx="0" ry="0" height="26" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(118,33)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath9)" width="326" rx="0" ry="0" height="22" stroke="none"/>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(122,34)" stroke="rgb(100,100,100)">
<path d="M2 2 L322 2 L322 28 L2 28 L2 2 ZM3 3 L321 3 L321 27 L3 27 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath9)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(117,32)" stroke="rgb(100,100,100)">
<path d="M2 2 L330 2 L330 26 L2 26 L2 2 ZM3 3 L329 3 L329 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath8)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(23,41)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(21,38)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath10)" stroke="none">Database:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" stroke="rgb(60,63,65)">
<rect x="0" width="78" height="23" y="0" clip-path="url(#clipPath11)" stroke="none"/>
<rect x="0" width="78" height="23" y="0" clip-path="url(#clipPath11)" stroke="none"/>
<image x="0" y="2" clip-path="url(#clipPath11)" width="19" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/radio.png" height="19" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="16" clip-path="url(#clipPath11)" stroke="none">In KeePass</text>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(-2,0)" stroke="rgb(60,63,65)">
<rect x="0" width="78" height="24" y="0" clip-path="url(#clipPath11)" stroke="none"/>
<rect x="0" width="78" height="24" y="0" clip-path="url(#clipPath11)" stroke="none"/>
<image x="0" y="3" clip-path="url(#clipPath11)" width="19" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/radio.png" height="19" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="17" clip-path="url(#clipPath11)" stroke="none">In KeePass</text>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

platform/platform-tests/testData/ui/layout/Darcula/win/align fields.svg
+18 -18
View File
@@ -8,19 +8,19 @@
<path d="M0 0 L480 0 L480 320 L0 320 L0 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
<path d="M0 0 L0 32 L350 32 L350 0 Z"/>
<path d="M0 0 L0 28 L352 28 L352 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
<path d="M-1 -1 L-1 31 L349 31 L349 -1 Z"/>
<path d="M-1 -1 L-1 27 L351 27 L351 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
<path d="M9 5 L9 27 L341 27 L341 5 Z"/>
<path d="M9 2 L9 26 L345 26 L345 2 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
<path d="M0 0 L0 16 L123 16 L123 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
<path d="M0 0 L0 22 L146 22 L146 0 Z"/>
<path d="M0 0 L0 24 L146 24 L146 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">
<path d="M0 0 L0 16 L124 16 L124 0 Z"/>
@@ -29,26 +29,26 @@
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" stroke="rgb(60,63,65)">
<rect x="0" width="480" height="320" y="0" clip-path="url(#clipPath1)" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(130,32)" stroke="rgb(60,63,65)">
<rect x="0" width="350" height="32" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(128,32)" stroke="rgb(60,63,65)">
<rect x="0" width="354" height="28" y="0" clip-path="url(#clipPath2)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(131,33)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath3)" width="344" rx="0" ry="0" height="26" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(129,33)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath3)" width="348" rx="0" ry="0" height="22" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(130,32)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="21" clip-path="url(#clipPath4)" stroke="none">input</text>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(128,32)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="19" clip-path="url(#clipPath4)" stroke="none">input</text>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(131,33)" stroke="rgb(100,100,100)">
<path d="M2 2 L346 2 L346 28 L2 28 L2 2 ZM3 3 L345 3 L345 27 L3 27 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath3)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(128,32)" stroke="rgb(100,100,100)">
<path d="M2 2 L352 2 L352 26 L2 26 L2 2 ZM3 3 L351 3 L351 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath2)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,36)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,38)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath5)" stroke="none">Android module name:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(130,0)" stroke="rgb(60,63,65)">
<rect x="0" width="146" height="22" y="0" clip-path="url(#clipPath6)" stroke="none"/>
<rect x="0" width="146" height="22" y="0" clip-path="url(#clipPath6)" stroke="none"/>
<image x="0" y="2" clip-path="url(#clipPath6)" width="18" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png" height="18" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="16" clip-path="url(#clipPath6)" stroke="none">Android module name:</text>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(128,0)" stroke="rgb(60,63,65)">
<rect x="0" width="146" height="24" y="0" clip-path="url(#clipPath6)" stroke="none"/>
<rect x="0" width="146" height="24" y="0" clip-path="url(#clipPath6)" stroke="none"/>
<image x="0" y="3" clip-path="url(#clipPath6)" width="18" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png" height="18" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="17" clip-path="url(#clipPath6)" stroke="none">Android module name:</text>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,4)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath7)" stroke="none">Create Android module</text>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

platform/platform-tests/testData/ui/layout/Darcula/win/cell.svg
+20 -20
View File
@@ -12,22 +12,22 @@
<path d="M0 0 L480 0 L480 320 L0 320 L0 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
<path d="M0 0 L0 248 L480 248 L480 0 Z"/>
<path d="M0 0 L0 254 L480 254 L480 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
<path d="M0 0 L0 16 L237 16 L237 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
<path d="M0 0 L0 30 L78 30 L78 0 Z"/>
<path d="M0 3 L0 30 L78 30 L78 3 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
<path d="M-1 -1 L-1 29 L77 29 L77 -1 Z"/>
<path d="M-1 2 L-1 29 L77 29 L77 2 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
<path d="M0 0 L0 30 L41 30 L41 0 Z"/>
<path d="M0 3 L0 30 L41 30 L41 3 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">
<path d="M-1 -1 L-1 29 L40 29 L40 -1 Z"/>
<path d="M-1 2 L-1 29 L40 29 L40 2 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">
<path d="M0 0 L0 22 L29 22 L29 0 Z"/>
@@ -39,42 +39,42 @@
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" stroke="rgb(60,63,65)">
<rect x="0" width="480" height="320" y="0" clip-path="url(#clipPath1)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" font-family="'Segoe UI'" transform="translate(0,62)" stroke="rgb(69,73,74)">
<rect x="0" width="480" height="248" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<g fill="rgb(69,73,74)" font-family="'Segoe UI'" transform="translate(0,56)" stroke="rgb(69,73,74)">
<rect x="0" width="480" height="254" y="0" clip-path="url(#clipPath2)" stroke="none"/>
</g>
<g fill="rgb(50,50,50)" font-family="'Segoe UI'" transform="translate(0,62)" stroke="rgb(50,50,50)">
<rect x="0" width="1" height="248" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<g fill="rgb(50,50,50)" font-family="'Segoe UI'" transform="translate(0,56)" stroke="rgb(50,50,50)">
<rect x="0" width="1" height="254" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="0" width="480" height="1" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="479" width="1" height="248" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="0" width="480" height="1" y="247" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="479" width="1" height="254" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="0" width="480" height="1" y="253" clip-path="url(#clipPath2)" stroke="none"/>
</g>
<g fill="rgb(120,120,120)" text-rendering="geometricPrecision" font-family="'Segoe UI'" transform="translate(69,36)" stroke="rgb(120,120,120)">
<g fill="rgb(120,120,120)" text-rendering="geometricPrecision" font-family="'Segoe UI'" transform="translate(66,30)" stroke="rgb(120,120,120)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath3)" stroke="none">Use File -&gt; Settings Repository... to configure</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,0)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(105,-3)" stroke="rgb(60,63,65)">
<rect x="0" width="78" height="30" y="0" clip-path="url(#clipPath4)" stroke="none"/>
</g>
<g fill="url(#linearGradient1)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,1)" stroke="url(#linearGradient1)">
<g fill="url(#linearGradient1)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(106,-2)" stroke="url(#linearGradient1)">
<rect x="2" y="2" clip-path="url(#clipPath5)" width="72" rx="3" ry="3" height="24" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(114,0)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(105,-3)" stroke="rgb(187,187,187)">
<text x="23" xml:space="preserve" y="20" clip-path="url(#clipPath4)" stroke="none">Delete</text>
</g>
<g fill="rgb(54,54,54)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,1)" stroke="rgb(54,54,54)">
<g fill="rgb(54,54,54)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(106,-2)" stroke="rgb(54,54,54)">
<rect x="2" y="26" clip-path="url(#clipPath5)" width="72" height="2" opacity="0.5" stroke="none"/>
<path fill="rgb(94,96,96)" d="M2 5 L2 23 C2 24.6569 3.3431 26 5 26 L71 26 C72.6569 26 74 24.6569 74 23 L74 5 C74 3.3431 72.6569 2 71 2 L5 2 C3.3431 2 2 3.3431 2 5 ZM3 5.5 L3 22.5 C3 23.8807 4.1193 25 5.5 25 L70.5 25 C71.8807 25 73 23.8807 73 22.5 L73 5.5 C73 4.1193 71.8807 3 70.5 3 L5.5 3 C4.1193 3 3 4.1193 3 5.5 Z" clip-path="url(#clipPath5)" fill-rule="evenodd" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(65,0)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(62,-3)" stroke="rgb(60,63,65)">
<rect x="0" width="41" height="30" y="0" clip-path="url(#clipPath6)" stroke="none"/>
<rect x="0" width="41" height="30" y="0" clip-path="url(#clipPath6)" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(66,1)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(63,-2)" stroke="rgb(60,63,65)">
<rect x="2" y="2" clip-path="url(#clipPath7)" width="35" rx="2.5" ry="2.5" height="24" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(73,4)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(70,1)" stroke="rgb(60,63,65)">
<rect x="0" width="29" height="22" y="0" clip-path="url(#clipPath8)" stroke="none"/>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(66,1)" stroke="rgb(100,100,100)">
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(63,-2)" stroke="rgb(100,100,100)">
<path d="M2 4.5 L2 23.5 C2 24.8807 3.1193 26 4.5 26 L34.5 26 C35.8807 26 37 24.8807 37 23.5 L37 4.5 C37 3.1193 35.8807 2 34.5 2 L4.5 2 C3.1193 2 2 3.1193 2 4.5 ZM3 5 L3 23 C3 24.1046 3.8954 25 5 25 L34 25 C35.1046 25 36 24.1046 36 23 L36 5 C36 3.8954 35.1046 3 34 3 L5 3 C3.8954 3 3 3.8954 3 5 Z" fill-rule="evenodd" clip-path="url(#clipPath7)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,4)" stroke="rgb(187,187,187)">
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

platform/platform-tests/testData/ui/layout/Darcula/win/note row in the dialog.svg
+16 -16
View File
@@ -11,13 +11,13 @@
<path d="M0 0 L0 20 L271 20 L271 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
<path d="M0 0 L0 22 L89 22 L89 0 Z"/>
<path d="M0 0 L0 24 L89 24 L89 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
<path d="M0 0 L0 30 L250 30 L250 0 Z"/>
<path d="M0 0 L0 28 L254 28 L254 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
<path d="M-1 -1 L-1 29 L249 29 L249 -1 Z"/>
<path d="M-1 -1 L-1 27 L253 27 L253 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
<path d="M0 0 L0 16 L83 16 L83 0 Z"/>
@@ -29,28 +29,28 @@
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" stroke="rgb(60,63,65)">
<rect x="0" width="480" height="320" y="0" clip-path="url(#clipPath1)" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(0,156)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(0,153)" stroke="rgb(60,63,65)">
<rect x="0" width="271" height="20" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<text fill="rgb(187,187,187)" x="3" xml:space="preserve" y="15" clip-path="url(#clipPath2)" stroke="none">Should be an empty row above as a gap. </text>
<text fill="rgb(88,157,246)" x="219" xml:space="preserve" y="15" clip-path="url(#clipPath2)" stroke="none">Click me</text>
<text fill="rgb(187,187,187)" x="265" xml:space="preserve" y="15" clip-path="url(#clipPath2)" stroke="none">.</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(89,112)" stroke="rgb(60,63,65)">
<rect x="0" width="89" height="22" y="0" clip-path="url(#clipPath3)" stroke="none"/>
<rect x="0" width="89" height="22" y="0" clip-path="url(#clipPath3)" stroke="none"/>
<image x="0" y="2" clip-path="url(#clipPath3)" width="18" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected.png" height="18" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="16" clip-path="url(#clipPath3)" stroke="none">&amp;Remember</text>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(87,107)" stroke="rgb(60,63,65)">
<rect x="0" width="89" height="24" y="0" clip-path="url(#clipPath3)" stroke="none"/>
<rect x="0" width="89" height="24" y="0" clip-path="url(#clipPath3)" stroke="none"/>
<image x="0" y="3" clip-path="url(#clipPath3)" width="18" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected.png" height="18" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="17" clip-path="url(#clipPath3)" stroke="none">&amp;Remember</text>
</g>
<g fill="rgb(60,63,65)" font-family="monospace" transform="translate(89,72)" stroke="rgb(60,63,65)">
<rect x="0" width="250" height="30" y="0" clip-path="url(#clipPath4)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="monospace" transform="translate(87,71)" stroke="rgb(60,63,65)">
<rect x="0" width="254" height="28" y="0" clip-path="url(#clipPath4)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(90,73)" stroke="rgb(69,73,74)">
<rect x="2" width="244" height="24" y="2" clip-path="url(#clipPath5)" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(88,72)" stroke="rgb(69,73,74)">
<rect x="2" width="248" height="22" y="2" clip-path="url(#clipPath5)" stroke="none"/>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(90,73)" stroke="rgb(100,100,100)">
<path d="M2 2 L246 2 L246 26 L2 26 L2 2 ZM3 3 L245 3 L245 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath5)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(87,71)" stroke="rgb(100,100,100)">
<path d="M2 2 L252 2 L252 26 L2 26 L2 2 ZM3 3 L251 3 L251 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath4)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,78)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,76)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath6)" stroke="none">Sudo password:</text>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,10)" stroke="rgb(187,187,187)">
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

platform/platform-tests/testData/ui/layout/Darcula/win/visual paddings.svg
+136 -136
View File
@@ -1,5 +1,5 @@
<!--suppress XmlUnusedNamespaceDeclaration -->
<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" viewBox="0 0 643 419" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto">
<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" viewBox="0 0 623 370" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto">
<!--Generated by the Batik Graphics2D SVG Generator-->
<defs id="genericDefs"/>
<g>
@@ -13,19 +13,19 @@
<stop stop-opacity="1" stop-color="rgb(76,80,82)" offset="100%"/>
</linearGradient>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
<path d="M0 0 L643 0 L643 419 L0 419 L0 0 Z"/>
<path d="M0 0 L623 0 L623 370 L0 370 L0 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
<path d="M0 0 L0 20 L529 20 L529 0 Z"/>
<path d="M0 0 L0 20 L509 20 L509 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
<path d="M0 0 L0 16 L61 16 L61 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
<path d="M0 0 L0 23 L34 23 L34 0 Z"/>
<path d="M0 0 L0 24 L34 24 L34 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
<path d="M0 0 L0 22 L29 22 L29 0 Z"/>
<path d="M0 0 L0 24 L29 24 L29 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
<path d="M0 0 L0 30 L78 30 L78 0 Z"/>
@@ -43,28 +43,28 @@
<path d="M0 0 L0 22 L38 22 L38 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">
<path d="M0 0 L0 30 L250 30 L250 0 Z"/>
<path d="M0 0 L0 28 L254 28 L254 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath12">
<path d="M-1 -1 L-1 29 L249 29 L249 -1 Z"/>
<path d="M-1 -1 L-1 27 L253 27 L253 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath13">
<path d="M9 5 L9 25 L241 25 L241 5 Z"/>
<path d="M9 2 L9 26 L245 26 L245 2 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath14">
<path d="M0 0 L0 32 L40 32 L40 0 Z"/>
<path d="M0 0 L0 28 L40 28 L40 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath15">
<path d="M-1 -1 L-1 31 L39 31 L39 -1 Z"/>
<path d="M-1 -1 L-1 27 L39 27 L39 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
<path d="M9 5 L9 27 L31 27 L31 5 Z"/>
<path d="M9 2 L9 26 L31 26 L31 2 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath17">
<path d="M0 0 L0 16 L17 16 L17 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
<path d="M0 0 L0 30 L529 30 L529 0 Z"/>
<path d="M0 0 L0 30 L512 30 L512 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath19">
<path d="M0 0 L0 16 L92 16 L92 0 Z"/>
@@ -79,19 +79,19 @@
<path d="M0 0 L0 16 L43 16 L43 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath23">
<path d="M0 0 L0 23 L48 23 L48 0 Z"/>
<path d="M0 0 L0 24 L48 24 L48 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">
<path d="M0 0 L0 16 L69 16 L69 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath25">
<path d="M0 0 L0 22 L65 22 L65 0 Z"/>
<path d="M0 0 L0 24 L65 24 L65 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath26">
<path d="M0 0 L0 16 L56 16 L56 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath27">
<path d="M-1 -1 L-1 29 L528 29 L528 -1 Z"/>
<path d="M-1 -1 L-1 29 L511 29 L511 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath28">
<path d="M0 0 L0 16 L39 16 L39 0 Z"/>
@@ -100,7 +100,7 @@
<path d="M0 0 L0 16 L108 16 L108 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath30">
<path d="M0 0 L0 22 L517 22 L517 0 Z"/>
<path d="M0 0 L0 22 L503 22 L503 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath31">
<path d="M0 0 L0 16 L63 16 L63 0 Z"/>
@@ -109,217 +109,217 @@
<path d="M0 0 L0 16 L53 16 L53 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath33">
<path d="M0 0 L0 32 L529 32 L529 0 Z"/>
<path d="M0 2 L0 28 L511 28 L511 2 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath34">
<path d="M-1 -1 L-1 31 L528 31 L528 -1 Z"/>
<path d="M-1 1 L-1 27 L510 27 L510 1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath35">
<path d="M9 5 L9 27 L520 27 L520 5 Z"/>
<path d="M9 2 L9 26 L504 26 L504 2 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="clipPath36">
<path d="M0 0 L0 16 L51 16 L51 0 Z"/>
</clipPath>
</defs>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" stroke="rgb(60,63,65)">
<rect x="0" width="643" height="419" y="0" clip-path="url(#clipPath1)" stroke="none"/>
<rect x="0" width="623" height="370" y="0" clip-path="url(#clipPath1)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" font-family="'Segoe UI'" transform="translate(114,389)" stroke="rgb(69,73,74)">
<rect x="0" width="529" height="20" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<g fill="rgb(69,73,74)" font-family="'Segoe UI'" transform="translate(114,340)" stroke="rgb(69,73,74)">
<rect x="0" width="509" height="20" y="0" clip-path="url(#clipPath2)" stroke="none"/>
</g>
<g fill="rgb(50,50,50)" font-family="'Segoe UI'" transform="translate(114,389)" stroke="rgb(50,50,50)">
<g fill="rgb(50,50,50)" font-family="'Segoe UI'" transform="translate(114,340)" stroke="rgb(50,50,50)">
<rect x="0" width="1" height="20" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="0" width="529" height="1" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="528" width="1" height="20" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="0" width="529" height="1" y="19" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="0" width="509" height="1" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="508" width="1" height="20" y="0" clip-path="url(#clipPath2)" stroke="none"/>
<rect x="0" width="509" height="1" y="19" clip-path="url(#clipPath2)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,393)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,341)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath3)" stroke="none">Scroll pane:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(601,347)" stroke="rgb(60,63,65)">
<rect x="0" width="34" height="23" y="0" clip-path="url(#clipPath4)" stroke="none"/>
<rect x="0" width="34" height="23" y="0" clip-path="url(#clipPath4)" stroke="none"/>
<image x="0" y="2" clip-path="url(#clipPath4)" width="19" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/radio.png" height="19" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="16" clip-path="url(#clipPath4)" stroke="none">rb</text>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(581,306)" stroke="rgb(60,63,65)">
<rect x="0" width="34" height="24" y="0" clip-path="url(#clipPath4)" stroke="none"/>
<rect x="0" width="34" height="24" y="0" clip-path="url(#clipPath4)" stroke="none"/>
<image x="0" y="3" clip-path="url(#clipPath4)" width="19" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/radio.png" height="19" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="17" clip-path="url(#clipPath4)" stroke="none">rb</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(564,347)" stroke="rgb(60,63,65)">
<rect x="0" width="29" height="22" y="0" clip-path="url(#clipPath5)" stroke="none"/>
<rect x="0" width="29" height="22" y="0" clip-path="url(#clipPath5)" stroke="none"/>
<image x="0" y="2" clip-path="url(#clipPath5)" width="18" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png" height="18" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="16" clip-path="url(#clipPath5)" stroke="none">c</text>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(546,306)" stroke="rgb(60,63,65)">
<rect x="0" width="29" height="24" y="0" clip-path="url(#clipPath5)" stroke="none"/>
<rect x="0" width="29" height="24" y="0" clip-path="url(#clipPath5)" stroke="none"/>
<image x="0" y="3" clip-path="url(#clipPath5)" width="18" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png" height="18" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="17" clip-path="url(#clipPath5)" stroke="none">c</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(478,347)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(465,303)" stroke="rgb(60,63,65)">
<rect x="0" width="78" height="30" y="0" clip-path="url(#clipPath6)" stroke="none"/>
</g>
<g fill="url(#linearGradient1)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(479,348)" stroke="url(#linearGradient1)">
<g fill="url(#linearGradient1)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(466,304)" stroke="url(#linearGradient1)">
<rect x="2" y="2" clip-path="url(#clipPath7)" width="72" rx="3" ry="3" height="24" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(478,347)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(465,303)" stroke="rgb(187,187,187)">
<text x="36" xml:space="preserve" y="20" clip-path="url(#clipPath6)" stroke="none">b</text>
</g>
<g fill="rgb(54,54,54)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(479,348)" stroke="rgb(54,54,54)">
<g fill="rgb(54,54,54)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(466,304)" stroke="rgb(54,54,54)">
<rect x="2" y="26" clip-path="url(#clipPath7)" width="72" height="2" opacity="0.5" stroke="none"/>
<path fill="rgb(94,96,96)" d="M2 5 L2 23 C2 24.6569 3.3431 26 5 26 L71 26 C72.6569 26 74 24.6569 74 23 L74 5 C74 3.3431 72.6569 2 71 2 L5 2 C3.3431 2 2 3.3431 2 5 ZM3 5.5 L3 22.5 C3 23.8807 4.1193 25 5.5 25 L70.5 25 C71.8807 25 73 23.8807 73 22.5 L73 5.5 C73 4.1193 71.8807 3 70.5 3 L5.5 3 C4.1193 3 3 4.1193 3 5.5 Z" clip-path="url(#clipPath7)" fill-rule="evenodd" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(420,347)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(413,303)" stroke="rgb(60,63,65)">
<rect x="0" width="50" height="30" y="0" clip-path="url(#clipPath8)" stroke="none"/>
<rect x="0" width="50" height="30" y="0" clip-path="url(#clipPath8)" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(421,348)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(414,304)" stroke="rgb(60,63,65)">
<rect x="2" y="2" clip-path="url(#clipPath9)" width="44" rx="2.5" ry="2.5" height="24" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(428,351)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(421,307)" stroke="rgb(60,63,65)">
<rect x="0" width="38" height="22" y="0" clip-path="url(#clipPath10)" stroke="none"/>
<text fill="rgb(187,187,187)" x="1" xml:space="preserve" y="16" clip-path="url(#clipPath10)" stroke="none">c1</text>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(421,348)" stroke="rgb(100,100,100)">
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(414,304)" stroke="rgb(100,100,100)">
<path d="M2 4.5 L2 23.5 C2 24.8807 3.1193 26 4.5 26 L43.5 26 C44.8807 26 46 24.8807 46 23.5 L46 4.5 C46 3.1193 44.8807 2 43.5 2 L4.5 2 C3.1193 2 2 3.1193 2 4.5 ZM3 5 L3 23 C3 24.1046 3.8954 25 5 25 L43 25 C44.1046 25 45 24.1046 45 23 L45 5 C45 3.8954 44.1046 3 43 3 L5 3 C3.8954 3 3 3.8954 3 5 Z" fill-rule="evenodd" clip-path="url(#clipPath9)" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="monospace" transform="translate(162,347)" stroke="rgb(60,63,65)">
<rect x="0" width="250" height="30" y="0" clip-path="url(#clipPath11)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="monospace" transform="translate(156,304)" stroke="rgb(60,63,65)">
<rect x="0" width="254" height="28" y="0" clip-path="url(#clipPath11)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(163,348)" stroke="rgb(69,73,74)">
<rect x="2" width="244" height="24" y="2" clip-path="url(#clipPath12)" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(157,305)" stroke="rgb(69,73,74)">
<rect x="2" width="248" height="22" y="2" clip-path="url(#clipPath12)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="monospace" transform="translate(162,347)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="16" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="23" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="30" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="37" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="44" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<g fill="rgb(187,187,187)" font-family="monospace" transform="translate(156,304)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="16" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="23" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="30" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="37" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="44" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(163,348)" stroke="rgb(100,100,100)">
<path d="M2 2 L246 2 L246 26 L2 26 L2 2 ZM3 3 L245 3 L245 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath12)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(156,304)" stroke="rgb(100,100,100)">
<path d="M2 2 L252 2 L252 26 L2 26 L2 2 ZM3 3 L251 3 L251 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath11)" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,347)" stroke="rgb(60,63,65)">
<rect x="0" width="40" height="32" y="0" clip-path="url(#clipPath14)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(112,304)" stroke="rgb(60,63,65)">
<rect x="0" width="40" height="28" y="0" clip-path="url(#clipPath14)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,348)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath15)" width="34" rx="0" ry="0" height="26" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(113,305)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath15)" width="34" rx="0" ry="0" height="22" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(114,347)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="21" clip-path="url(#clipPath16)" stroke="none">t</text>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(112,304)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="19" clip-path="url(#clipPath16)" stroke="none">t</text>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,348)" stroke="rgb(100,100,100)">
<path d="M2 2 L36 2 L36 28 L2 28 L2 2 ZM3 3 L35 3 L35 27 L3 27 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath15)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,304)" stroke="rgb(100,100,100)">
<path d="M2 2 L38 2 L38 26 L2 26 L2 2 ZM3 3 L37 3 L37 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath14)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,351)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,310)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath17)" stroke="none">All:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,307)" stroke="rgb(60,63,65)">
<rect x="0" width="529" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(111,269)" stroke="rgb(60,63,65)">
<rect x="0" width="515" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,311)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,276)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath19)" stroke="none">Text with browse:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,267)" stroke="rgb(60,63,65)">
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(111,235)" stroke="rgb(60,63,65)">
<rect x="0" width="72" height="30" y="0" clip-path="url(#clipPath20)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,268)" stroke="rgb(69,73,74)">
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,236)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath21)" width="66" rx="2.5" ry="2.5" height="24" stroke="none"/>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,268)" stroke="rgb(100,100,100)">
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,236)" stroke="rgb(100,100,100)">
<path d="M2 4.5 L2 23.5 C2 24.8807 3.1193 26 4.5 26 L65.5 26 C66.8807 26 68 24.8807 68 23.5 L68 4.5 C68 3.1193 66.8807 2 65.5 2 L4.5 2 C3.1193 2 2 3.1193 2 4.5 ZM3 5.5 L3 22.5 C3 23.8807 4.1193 25 5.5 25 L64.5 25 C65.8807 25 67 23.8807 67 22.5 L67 5.5 C67 4.1193 65.8807 3 64.5 3 L5.5 3 C4.1193 3 3 4.1193 3 5.5 Z" fill-rule="evenodd" clip-path="url(#clipPath21)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,271)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,242)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath22)" stroke="none">Spinner:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,234)" stroke="rgb(60,63,65)">
<rect x="0" width="48" height="23" y="0" clip-path="url(#clipPath23)" stroke="none"/>
<rect x="0" width="48" height="23" y="0" clip-path="url(#clipPath23)" stroke="none"/>
<image x="0" y="2" clip-path="url(#clipPath23)" width="19" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/radio.png" height="19" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="16" clip-path="url(#clipPath23)" stroke="none">label</text>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(112,204)" stroke="rgb(60,63,65)">
<rect x="0" width="48" height="24" y="0" clip-path="url(#clipPath23)" stroke="none"/>
<rect x="0" width="48" height="24" y="0" clip-path="url(#clipPath23)" stroke="none"/>
<image x="0" y="3" clip-path="url(#clipPath23)" width="19" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/radio.png" height="19" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="17" clip-path="url(#clipPath23)" stroke="none">label</text>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,238)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,208)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath24)" stroke="none">RadioButton:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,202)" stroke="rgb(60,63,65)">
<rect x="0" width="65" height="22" y="0" clip-path="url(#clipPath25)" stroke="none"/>
<rect x="0" width="65" height="22" y="0" clip-path="url(#clipPath25)" stroke="none"/>
<image x="0" y="2" clip-path="url(#clipPath25)" width="18" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png" height="18" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="16" clip-path="url(#clipPath25)" stroke="none">enabled</text>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(112,170)" stroke="rgb(60,63,65)">
<rect x="0" width="65" height="24" y="0" clip-path="url(#clipPath25)" stroke="none"/>
<rect x="0" width="65" height="24" y="0" clip-path="url(#clipPath25)" stroke="none"/>
<image x="0" y="3" clip-path="url(#clipPath25)" width="18" xlink:href="../../../../../../platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png" height="18" preserveAspectRatio="none"/>
<text fill="rgb(187,187,187)" x="23" xml:space="preserve" y="17" clip-path="url(#clipPath25)" stroke="none">enabled</text>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,206)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,174)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath26)" stroke="none">CheckBox:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,162)" stroke="rgb(60,63,65)">
<rect x="0" width="529" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(111,133)" stroke="rgb(60,63,65)">
<rect x="0" width="515" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
</g>
<g fill="url(#linearGradient2)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,163)" stroke="url(#linearGradient2)">
<rect x="2" y="2" clip-path="url(#clipPath27)" width="523" rx="3" ry="3" height="24" stroke="none"/>
<g fill="url(#linearGradient2)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,134)" stroke="url(#linearGradient2)">
<rect x="2" y="2" clip-path="url(#clipPath27)" width="509" rx="3" ry="3" height="24" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(114,162)" stroke="rgb(187,187,187)">
<text x="252" xml:space="preserve" y="20" clip-path="url(#clipPath18)" stroke="none">label</text>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(111,133)" stroke="rgb(187,187,187)">
<text x="245" xml:space="preserve" y="20" clip-path="url(#clipPath18)" stroke="none">label</text>
</g>
<g fill="rgb(54,54,54)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,163)" stroke="rgb(54,54,54)">
<rect x="2" y="26" clip-path="url(#clipPath27)" width="523" height="2" opacity="0.5" stroke="none"/>
<path fill="rgb(94,96,96)" d="M2 5 L2 23 C2 24.6569 3.3431 26 5 26 L522 26 C523.6569 26 525 24.6569 525 23 L525 5 C525 3.3431 523.6569 2 522 2 L5 2 C3.3431 2 2 3.3431 2 5 ZM3 5.5 L3 22.5 C3 23.8807 4.1193 25 5.5 25 L521.5 25 C522.8807 25 524 23.8807 524 22.5 L524 5.5 C524 4.1193 522.8807 3 521.5 3 L5.5 3 C4.1193 3 3 4.1193 3 5.5 Z" clip-path="url(#clipPath27)" fill-rule="evenodd" stroke="none"/>
<g fill="rgb(54,54,54)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,134)" stroke="rgb(54,54,54)">
<rect x="2" y="26" clip-path="url(#clipPath27)" width="509" height="2" opacity="0.5" stroke="none"/>
<path fill="rgb(94,96,96)" d="M2 5 L2 23 C2 24.6569 3.3431 26 5 26 L508 26 C509.6569 26 511 24.6569 511 23 L511 5 C511 3.3431 509.6569 2 508 2 L5 2 C3.3431 2 2 3.3431 2 5 ZM3 5.5 L3 22.5 C3 23.8807 4.1193 25 5.5 25 L507.5 25 C508.8807 25 510 23.8807 510 22.5 L510 5.5 C510 4.1193 508.8807 3 507.5 3 L5.5 3 C4.1193 3 3 4.1193 3 5.5 Z" clip-path="url(#clipPath27)" fill-rule="evenodd" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,166)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,140)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath28)" stroke="none">Button:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,122)" stroke="rgb(60,63,65)">
<rect x="0" width="529" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
<rect x="0" width="529" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(111,99)" stroke="rgb(60,63,65)">
<rect x="0" width="515" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
<rect x="0" width="515" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,123)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath27)" width="523" rx="2.5" ry="2.5" height="24" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,100)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath27)" width="509" rx="2.5" ry="2.5" height="24" stroke="none"/>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,123)" stroke="rgb(100,100,100)">
<path d="M2 4.5 L2 23.5 C2 24.8807 3.1193 26 4.5 26 L522.5 26 C523.8807 26 525 24.8807 525 23.5 L525 4.5 C525 3.1193 523.8807 2 522.5 2 L4.5 2 C3.1193 2 2 3.1193 2 4.5 ZM3 5 L3 23 C3 24.1046 3.8954 25 5 25 L522 25 C523.1046 25 524 24.1046 524 23 L524 5 C524 3.8954 523.1046 3 522 3 L5 3 C3.8954 3 3 3.8954 3 5 Z" fill-rule="evenodd" clip-path="url(#clipPath27)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,100)" stroke="rgb(100,100,100)">
<path d="M2 4.5 L2 23.5 C2 24.8807 3.1193 26 4.5 26 L508.5 26 C509.8807 26 511 24.8807 511 23.5 L511 4.5 C511 3.1193 509.8807 2 508.5 2 L4.5 2 C3.1193 2 2 3.1193 2 4.5 ZM3 5 L3 23 C3 24.1046 3.8954 25 5 25 L508 25 C509.1046 25 510 24.1046 510 23 L510 5 C510 3.8954 509.1046 3 508 3 L5 3 C3.8954 3 3 3.8954 3 5 Z" fill-rule="evenodd" clip-path="url(#clipPath27)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,126)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,106)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath29)" stroke="none">Combobox Editable:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,82)" stroke="rgb(60,63,65)">
<rect x="0" width="529" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
<rect x="0" width="529" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(111,65)" stroke="rgb(60,63,65)">
<rect x="0" width="515" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
<rect x="0" width="515" height="30" y="0" clip-path="url(#clipPath18)" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,83)" stroke="rgb(60,63,65)">
<rect x="2" y="2" clip-path="url(#clipPath27)" width="523" rx="2.5" ry="2.5" height="24" stroke="none"/>
<g fill="rgb(60,63,65)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,66)" stroke="rgb(60,63,65)">
<rect x="2" y="2" clip-path="url(#clipPath27)" width="509" rx="2.5" ry="2.5" height="24" stroke="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(122,86)" stroke="rgb(60,63,65)">
<rect x="0" width="517" height="22" y="0" clip-path="url(#clipPath30)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(119,69)" stroke="rgb(60,63,65)">
<rect x="0" width="503" height="22" y="0" clip-path="url(#clipPath30)" stroke="none"/>
<text fill="rgb(187,187,187)" x="1" xml:space="preserve" y="16" clip-path="url(#clipPath30)" stroke="none">one</text>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,83)" stroke="rgb(100,100,100)">
<path d="M2 4.5 L2 23.5 C2 24.8807 3.1193 26 4.5 26 L522.5 26 C523.8807 26 525 24.8807 525 23.5 L525 4.5 C525 3.1193 523.8807 2 522.5 2 L4.5 2 C3.1193 2 2 3.1193 2 4.5 ZM3 5 L3 23 C3 24.1046 3.8954 25 5 25 L522 25 C523.1046 25 524 24.1046 524 23 L524 5 C524 3.8954 523.1046 3 522 3 L5 3 C3.8954 3 3 3.8954 3 5 Z" fill-rule="evenodd" clip-path="url(#clipPath27)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,66)" stroke="rgb(100,100,100)">
<path d="M2 4.5 L2 23.5 C2 24.8807 3.1193 26 4.5 26 L508.5 26 C509.8807 26 511 24.8807 511 23.5 L511 4.5 C511 3.1193 509.8807 2 508.5 2 L4.5 2 C3.1193 2 2 3.1193 2 4.5 ZM3 5 L3 23 C3 24.1046 3.8954 25 5 25 L508 25 C509.1046 25 510 24.1046 510 23 L510 5 C510 3.8954 509.1046 3 508 3 L5 3 C3.8954 3 3 3.8954 3 5 Z" fill-rule="evenodd" clip-path="url(#clipPath27)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,86)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,72)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath31)" stroke="none">Combobox:</text>
</g>
<g fill="rgb(60,63,65)" font-family="monospace" transform="translate(114,42)" stroke="rgb(60,63,65)">
<rect x="0" width="250" height="30" y="0" clip-path="url(#clipPath11)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="monospace" transform="translate(112,32)" stroke="rgb(60,63,65)">
<rect x="0" width="254" height="28" y="0" clip-path="url(#clipPath11)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(115,43)" stroke="rgb(69,73,74)">
<rect x="2" width="244" height="24" y="2" clip-path="url(#clipPath12)" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(113,33)" stroke="rgb(69,73,74)">
<rect x="2" width="248" height="22" y="2" clip-path="url(#clipPath12)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="monospace" transform="translate(114,42)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="16" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="23" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="30" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="37" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="44" xml:space="preserve" y="19" clip-path="url(#clipPath13)" stroke="none">•</text>
<g fill="rgb(187,187,187)" font-family="monospace" transform="translate(112,32)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="16" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="23" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="30" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="37" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
<text x="44" xml:space="preserve" y="18" clip-path="url(#clipPath13)" stroke="none">•</text>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(115,43)" stroke="rgb(100,100,100)">
<path d="M2 2 L246 2 L246 26 L2 26 L2 2 ZM3 3 L245 3 L245 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath12)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="monospace" transform="translate(112,32)" stroke="rgb(100,100,100)">
<path d="M2 2 L252 2 L252 26 L2 26 L2 2 ZM3 3 L251 3 L251 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath11)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,46)" stroke="rgb(187,187,187)">
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,38)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath32)" stroke="none">Password:</text>
</g>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(114,0)" stroke="rgb(60,63,65)">
<rect x="0" width="529" height="32" y="0" clip-path="url(#clipPath33)" stroke="none"/>
<g fill="rgb(60,63,65)" font-family="'Segoe UI'" transform="translate(112,-2)" stroke="rgb(60,63,65)">
<rect x="0" width="513" height="28" y="0" clip-path="url(#clipPath33)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,1)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath34)" width="523" rx="0" ry="0" height="26" stroke="none"/>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(113,-1)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#clipPath34)" width="507" rx="0" ry="0" height="22" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(114,0)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="21" clip-path="url(#clipPath35)" stroke="none">text</text>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(112,-2)" stroke="rgb(187,187,187)">
<text x="9" xml:space="preserve" y="19" clip-path="url(#clipPath35)" stroke="none">text</text>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(115,1)" stroke="rgb(100,100,100)">
<path d="M2 2 L525 2 L525 28 L2 28 L2 2 ZM3 3 L524 3 L524 27 L3 27 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath34)" stroke="none"/>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="'Segoe UI'" transform="translate(112,-2)" stroke="rgb(100,100,100)">
<path d="M2 2 L511 2 L511 26 L2 26 L2 2 ZM3 3 L510 3 L510 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#clipPath33)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-family="'Segoe UI'" transform="translate(0,4)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="13" clip-path="url(#clipPath36)" stroke="none">Text field:</text>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt
+3 -10
View File
@@ -13,12 +13,10 @@ import org.apache.batik.svggen.ImageHandlerBase64Encoder
import org.apache.batik.svggen.SVGGeneratorContext
import org.apache.batik.svggen.SVGGraphics2D
import org.apache.batik.svggen.SVGSyntax
import org.apache.xmlgraphics.java2d.GraphicsConfigurationWithTransparency
import org.w3c.dom.Element
import java.awt.Component
import java.awt.GraphicsConfiguration
import java.awt.Image
import java.awt.Rectangle
import java.io.StringWriter
import java.nio.file.Path
import java.nio.file.Paths
@@ -28,14 +26,9 @@ import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult
// jFreeSvg produces not so compact and readable SVG as batik
internal class SvgRenderer(val svgFileDir: Path) {
internal class SvgRenderer(val svgFileDir: Path, private val deviceConfiguration: GraphicsConfiguration) {
private val xmlTransformer = TransformerFactory.newInstance().newTransformer()
// todo check on Retina - does it works or not (is Retina disabled or not)
val deviceConfiguration = object : GraphicsConfigurationWithTransparency() {
override fun getBounds() = Rectangle(0, 0, 1000, 1000)
}
private val xmlFactory = GenericDOMImplementation.getDOMImplementation().createDocument(SVGDOMImplementation.SVG_NAMESPACE_URI, "svg", null)
private val context = SVGGeneratorContext.createDefault(xmlFactory)
@@ -84,8 +77,8 @@ internal class SvgRenderer(val svgFileDir: Path) {
val index = outputPath.indexOf(moduleName)
if (index > 0) {
return FileUtilRt.toSystemIndependentName(svgFileDir
.relativize(Paths.get(PathManagerEx.getCommunityHomePath(), relativePath, outputPath.substring(index + moduleName.length + 1 /* slash */)))
.toString())
.relativize(Paths.get(PathManagerEx.getCommunityHomePath(), relativePath, outputPath.substring(index + moduleName.length + 1 /* slash */)))
.toString())
}
}
platform/platform-tests/testSrc/com/intellij/ui/UiTestRule.kt
+38
View File
@@ -0,0 +1,38 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ui
import com.intellij.util.ui.JBUI
import org.apache.xmlgraphics.java2d.GraphicsConfigurationWithTransparency
import org.junit.rules.TestName
import java.awt.Rectangle
import java.nio.file.Path
import javax.swing.JPanel
class UiTestRule(private val testDataRoot: Path) : RequireHeadlessMode() {
// must be lazy, otherwise we cannot change `java.awt.headless`
private val graphicsConfiguration by lazy {
object : GraphicsConfigurationWithTransparency() {
override fun getBounds() = Rectangle(0, 0, 1000, 1000)
}
}
fun validate(panel: JPanel, testName: TestName, lafName: String) {
validate(panel, testName.snapshotFileName, lafName)
}
fun validate(panel: JPanel, snapshotName: String, lafName: String) {
val svgRenderer = SvgRenderer(testDataRoot.resolve(getSnapshotRelativePath(lafName, isForImage = true)), graphicsConfiguration)
// to run tests on retina monitor (@2x images must be not used and so on)
// actually, not required (IconUtil correctly uses graphics device configuration), but just to be sure
AppUIUtil.setGraphicsConfiguration(panel, graphicsConfiguration)
val preferredSize = panel.preferredSize
panel.setBounds(0, 0, Math.max(preferredSize.width, JBUI.scale(480)), Math.max(preferredSize.height, 320))
panel.doLayout()
validateUsingImage(panel, svgRenderer, snapshotName)
validateBounds(panel, testDataRoot.resolve(getSnapshotRelativePath(lafName, isForImage = false)), snapshotName)
}
}
platform/platform-tests/testSrc/com/intellij/ui/laf/LafTest.kt
+5 -3
View File
@@ -6,7 +6,9 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
import com.intellij.openapi.ui.VerticalFlowLayout
import com.intellij.testFramework.PlatformTestUtil
import com.intellij.testFramework.UsefulTestCase
import com.intellij.ui.*
import com.intellij.ui.JBIntSpinner
import com.intellij.ui.UiTestRule
import com.intellij.ui.changeLafIfNeed
import com.intellij.ui.components.CheckBox
import com.intellij.ui.components.textFieldWithHistoryWithBrowseButton
import com.intellij.ui.layout.*
@@ -34,7 +36,7 @@ class LafTest {
@JvmField
@ClassRule
val requireHeadlessMode = RequireHeadlessMode()
val uiRule = UiTestRule(Paths.get(PlatformTestUtil.getPlatformTestDataPath(), "ui", "laf"))
}
@Suppress("MemberVisibilityCanBePrivate")
@@ -77,7 +79,7 @@ class LafTest {
private fun doTest(panelCreator: () -> JPanel) {
invokeAndWaitIfNeed {
validatePanel(panelCreator(), Paths.get(PlatformTestUtil.getPlatformTestDataPath(), "ui", "laf"), testName.snapshotFileName, lafName)
uiRule.validate(panelCreator(), testName, lafName)
}
}
}
platform/platform-tests/testSrc/com/intellij/ui/layout/MigLayoutTestApp.kt
+3 -2
View File
@@ -2,6 +2,7 @@
package com.intellij.ui.layout
import com.intellij.ide.ui.laf.IntelliJLaf
import com.intellij.ide.ui.laf.darcula.DarculaLaf
import com.intellij.openapi.util.SystemInfoRt
import com.intellij.testFramework.runInEdtAndWait
import com.intellij.ui.components.dialog
@@ -28,8 +29,8 @@ object MigLayoutTestApp {
runInEdtAndWait {
UIManager.setLookAndFeel(MetalLookAndFeel())
UIManager.setLookAndFeel(IntelliJLaf())
// UIManager.setLookAndFeel(DarculaLaf())
// UIManager.setLookAndFeel(IntelliJLaf())
UIManager.setLookAndFeel(DarculaLaf())
// val panel = visualPaddingsPanelOnlyButton()
// val panel = visualPaddingsPanelOnlyComboBox()
platform/platform-tests/testSrc/com/intellij/ui/layout/UiDslTest.kt
+7 -7
View File
@@ -5,13 +5,14 @@ import com.intellij.openapi.application.invokeAndWaitIfNeed
import com.intellij.openapi.util.SystemInfoRt
import com.intellij.testFramework.PlatformTestUtil
import com.intellij.testFramework.UsefulTestCase
import com.intellij.ui.RequireHeadlessMode
import com.intellij.ui.UiTestRule
import com.intellij.ui.changeLafIfNeed
import com.intellij.ui.snapshotFileName
import com.intellij.ui.validatePanel
import net.miginfocom.layout.LayoutUtil
import org.junit.*
import org.junit.After
import org.junit.Assume.assumeTrue
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TestName
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
@@ -29,8 +30,7 @@ class UiDslTest {
fun lafNames() = listOf("Darcula", "IntelliJ")
@JvmField
@ClassRule
val requireHeadlessMode = RequireHeadlessMode()
val uiRule = UiTestRule(Paths.get(PlatformTestUtil.getPlatformTestDataPath(), "ui", "layout"))
}
@Suppress("MemberVisibilityCanBePrivate")
@@ -85,7 +85,7 @@ class UiDslTest {
LayoutUtil.setGlobalDebugMillis(1000)
val panel = panelCreator()
try {
validatePanel(panel, Paths.get(PlatformTestUtil.getPlatformTestDataPath(), "ui", "layout"), testName.snapshotFileName, lafName)
uiRule.validate(panel, testName, lafName)
}
finally {
LayoutUtil.setGlobalDebugMillis(0)
platform/platform-tests/testSrc/com/intellij/ui/uiTestUtil.kt
+1 -29
View File
@@ -12,7 +12,6 @@ import com.intellij.ui.layout.*
import com.intellij.util.io.exists
import com.intellij.util.io.sanitizeFileName
import com.intellij.util.io.write
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.TestScaleHelper
import com.intellij.util.ui.UIUtil
import io.netty.util.internal.SystemPropertyUtil
@@ -29,7 +28,6 @@ import java.io.File
import java.nio.file.Path
import javax.swing.AbstractButton
import javax.swing.JLabel
import javax.swing.JPanel
import javax.swing.UIManager
import javax.swing.plaf.metal.MetalLookAndFeel
@@ -47,7 +45,7 @@ class NoScaleRule : ExternalResource() {
}
}
class RequireHeadlessMode : ExternalResource() {
open class RequireHeadlessMode : ExternalResource() {
override fun before() {
// there is some difference if run as not headless (on retina monitor, at least), not yet clear why, so, just require to run in headless mode
if (UsefulTestCase.IS_UNDER_TEAMCITY) {
@@ -167,29 +165,3 @@ internal fun getComponentKey(c: Component, index: Int): String {
return "${c.javaClass.simpleName} #${index}"
}
}
fun validatePanel(userPanel: JPanel, testDataRoot: Path, snapshotName: String, lafName: String) {
val svgRenderer = SvgRenderer(testDataRoot.resolve(getSnapshotRelativePath(lafName, isForImage = true)))
// to run tests on retina monitor (@2x images must be not used and so on)
// Graphics2D.getDeviceConfiguration is not enough because our IconLoader.paintIcon uses component.getGraphicsConfiguration() instead of g.getDeviceConfiguration()
// val panel = object : JComponent() {
// override fun getGraphicsConfiguration() = svgRenderer.deviceConfiguration
//
// override fun paint(g: Graphics) {
// // paint userPanel directly to ensure that SVG doesn't contain this wrapper
// userPanel.paint(g)
// }
// }
// panel.add(userPanel)
// panel.addNotify()
val preferredSize = userPanel.preferredSize
// panel.setBounds(0, 0, Math.max(preferredSize.width, JBUI.scale(480)), Math.max(preferredSize.height, 320))
userPanel.setBounds(0, 0, Math.max(preferredSize.width, JBUI.scale(480)), Math.max(preferredSize.height, 320))
userPanel.doLayout()
validateUsingImage(userPanel, svgRenderer, snapshotName)
validateBounds(userPanel, testDataRoot.resolve(getSnapshotRelativePath(lafName, isForImage = false)), snapshotName)
}
platform/util/src/com/intellij/util/ui/JBUI.java
+3 -3
View File
@@ -563,7 +563,7 @@ public class JBUI {
* An equivalent of {@code isHiDPI(scale(1f))}
*/
public static boolean isUsrHiDPI() {
return isHiDPI(scale(1f));
return isHiDPI(scale(1f));
}
/**
@@ -1477,7 +1477,7 @@ public class JBUI {
* Correct input size is used now only for UI DSL.
*/
public static boolean isUseCorrectInputHeight(@NotNull Component component) {
if (!(SystemInfoRt.isMac || UIUtil.isUnderWin10LookAndFeel())) {
if (SystemInfoRt.isLinux) {
return false;
}
@@ -1486,6 +1486,6 @@ public class JBUI {
}
public static boolean isCompensateVisualPaddingOnComponentLevel(@Nullable Component parent) {
return !((SystemInfoRt.isMac || UIUtil.isUnderWin10LookAndFeel()) && parent instanceof JPanel && ((JPanel)parent).getClientProperty(COMPENSATE_VISUAL_PADDING_KEY) == Boolean.FALSE);
return SystemInfoRt.isLinux || !(parent instanceof JPanel && ((JPanel)parent).getClientProperty(COMPENSATE_VISUAL_PADDING_KEY) == Boolean.FALSE);
}
}