From 2d86cad9aed094e80d1ce927c62602ed02ee6886 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 20 Dec 2019 18:19:37 +0100 Subject: [PATCH] update UI DSL snapshots GitOrigin-RevId: 0924a4a324aa5a7e5fef845ce5c16091d1911f8c --- .../align fields in the nested grid.yml | 36 ++--- .../testData/ui/layout/align fields.yml | 18 +-- .../testData/ui/layout/cell.yml | 26 ++-- .../ui/layout/checkbox that acts as label.yml | 24 ++-- ... add visual paddings for titled border.yml | 26 ++-- .../testData/ui/layout/hideable row.yml | 24 ++-- .../ui/layout/note row in the dialog.yml | 38 +++--- .../ui/layout/sample configurable panel.yml | 126 +++++++++--------- .../testData/ui/layout/scrollPaneNoGrow.yml | 12 +- .../testData/ui/layout/subRowsIndent.yml | 34 ++--- .../testData/ui/layout/titled row.yml | 40 +++--- .../testData/ui/layout/titled rows.yml | 86 ++++++------ .../testData/ui/layout/vertical buttons.yml | 18 +-- .../testData/ui/layout/visual paddings.yml | 40 +++--- 14 files changed, 274 insertions(+), 274 deletions(-) diff --git a/platform/platform-tests/testData/ui/layout/align fields in the nested grid.yml b/platform/platform-tests/testData/ui/layout/align fields in the nested grid.yml index b658d620833b..7356863122e1 100644 --- a/platform/platform-tests/testData/ui/layout/align fields in the nested grid.yml +++ b/platform/platform-tests/testData/ui/layout/align fields in the nested grid.yml @@ -8,27 +8,27 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} - - align: *id003 - - align: *id003 + - align: &id005 {horizontal: false, unit: -1, value: 0.0} + - align: *id005 + - align: *id005 gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 - - align: *id003 + max: &id006 {horizontal: true, value: 6.0} + min: *id006 + preferred: *id006 + - align: *id005 count: 4 columnConstraints: constraints: - gapAfter: - max: &id005 {horizontal: true, value: 6.0} - min: *id005 - preferred: *id005 + max: &id007 {horizontal: true, value: 6.0} + min: *id007 + preferred: *id007 grow: 0.0 - {} count: 2 @@ -37,16 +37,16 @@ componentConstrains: Database [label]: horizontal: gapBefore: - min: &id006 {horizontal: true, value: 20.0} - preferred: *id006 + min: &id008 {horizontal: true, value: 20.0} + preferred: *id008 'JTextField #2': horizontal: {grow: 100.0} 'JLabel #3': {spanX: INF, wrap: true} Master Password [label]: horizontal: gapBefore: - min: &id007 {horizontal: true, value: 20.0} - preferred: *id007 + min: &id009 {horizontal: true, value: 20.0} + preferred: *id009 'JBPasswordField #5': horizontal: {grow: 100.0} spanX: INF diff --git a/platform/platform-tests/testData/ui/layout/align fields.yml b/platform/platform-tests/testData/ui/layout/align fields.yml index a28208493354..4e44572e5fb2 100644 --- a/platform/platform-tests/testData/ui/layout/align fields.yml +++ b/platform/platform-tests/testData/ui/layout/align fields.yml @@ -8,21 +8,21 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} - - align: *id003 + - align: &id005 {horizontal: false, unit: -1, value: 0.0} + - align: *id005 count: 2 columnConstraints: constraints: - gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 + max: &id006 {horizontal: true, value: 6.0} + min: *id006 + preferred: *id006 grow: 0.0 - {} count: 2 diff --git a/platform/platform-tests/testData/ui/layout/cell.yml b/platform/platform-tests/testData/ui/layout/cell.yml index 852f29a6ca0b..6ef287eaa41d 100644 --- a/platform/platform-tests/testData/ui/layout/cell.yml +++ b/platform/platform-tests/testData/ui/layout/cell.yml @@ -8,26 +8,26 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id004 {horizontal: false, unit: -1, value: 0.0} + - align: &id006 {horizontal: false, unit: -1, value: 0.0} gapAfter: - max: &id003 {horizontal: true, value: 6.0} - min: *id003 - preferred: *id003 - - align: *id004 - - align: *id004 + max: &id005 {horizontal: true, value: 6.0} + min: *id005 + preferred: *id005 + - align: *id006 + - align: *id006 count: 3 columnConstraints: constraints: - gapAfter: - max: &id005 {horizontal: true, value: 6.0} - min: *id005 - preferred: *id005 + max: &id007 {horizontal: true, value: 6.0} + min: *id007 + preferred: *id007 grow: 0.0 - {} count: 2 diff --git a/platform/platform-tests/testData/ui/layout/checkbox that acts as label.yml b/platform/platform-tests/testData/ui/layout/checkbox that acts as label.yml index 8d7726a35b3a..49022ed46d08 100644 --- a/platform/platform-tests/testData/ui/layout/checkbox that acts as label.yml +++ b/platform/platform-tests/testData/ui/layout/checkbox that acts as label.yml @@ -8,26 +8,26 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} - - align: *id003 + - align: &id005 {horizontal: false, unit: -1, value: 0.0} + - align: *id005 count: 2 columnConstraints: constraints: - gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 + max: &id006 {horizontal: true, value: 6.0} + min: *id006 + preferred: *id006 grow: 0.0 - gapAfter: - max: &id005 {horizontal: true, value: 6.0} - min: *id005 - preferred: *id005 + max: &id007 {horizontal: true, value: 6.0} + min: *id007 + preferred: *id007 - {} count: 3 componentConstrains: diff --git a/platform/platform-tests/testData/ui/layout/do not add visual paddings for titled border.yml b/platform/platform-tests/testData/ui/layout/do not add visual paddings for titled border.yml index be768ac0378f..16e895ffeae0 100644 --- a/platform/platform-tests/testData/ui/layout/do not add visual paddings for titled border.yml +++ b/platform/platform-tests/testData/ui/layout/do not add visual paddings for titled border.yml @@ -8,26 +8,26 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id004 {horizontal: false, unit: -1, value: 0.0} + - align: &id006 {horizontal: false, unit: -1, value: 0.0} gapAfter: - max: &id003 {horizontal: true, value: 6.0} - min: *id003 - preferred: *id003 - - align: *id004 - - align: *id004 + max: &id005 {horizontal: true, value: 6.0} + min: *id005 + preferred: *id005 + - align: *id006 + - align: *id006 count: 3 columnConstraints: constraints: - gapAfter: - max: &id005 {horizontal: true, value: 6.0} - min: *id005 - preferred: *id005 + max: &id007 {horizontal: true, value: 6.0} + min: *id007 + preferred: *id007 grow: 0.0 - {} count: 2 diff --git a/platform/platform-tests/testData/ui/layout/hideable row.yml b/platform/platform-tests/testData/ui/layout/hideable row.yml index 714939735fa0..479c0bb7ed8d 100644 --- a/platform/platform-tests/testData/ui/layout/hideable row.yml +++ b/platform/platform-tests/testData/ui/layout/hideable row.yml @@ -8,22 +8,22 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} - - align: *id003 - - align: *id003 + - align: &id005 {horizontal: false, unit: -1, value: 0.0} + - align: *id005 + - align: *id005 count: 3 columnConstraints: constraints: - gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 + max: &id006 {horizontal: true, value: 6.0} + min: *id006 + preferred: *id006 grow: 0.0 - {} count: 2 @@ -41,8 +41,8 @@ componentConstrains: hideMode: 0 horizontal: gapBefore: - min: &id005 {horizontal: true, value: 20.0} - preferred: *id005 + min: &id007 {horizontal: true, value: 20.0} + preferred: *id007 grow: 100.0 spanX: INF wrap: true \ No newline at end of file diff --git a/platform/platform-tests/testData/ui/layout/note row in the dialog.yml b/platform/platform-tests/testData/ui/layout/note row in the dialog.yml index 97316cac00aa..aca56f3f9ea5 100644 --- a/platform/platform-tests/testData/ui/layout/note row in the dialog.yml +++ b/platform/platform-tests/testData/ui/layout/note row in the dialog.yml @@ -8,25 +8,25 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} + - align: &id005 {horizontal: false, unit: -1, value: 0.0} noGrid: true - - align: *id003 - - align: *id003 - - align: *id003 + - align: *id005 + - align: *id005 + - align: *id005 noGrid: true count: 4 columnConstraints: constraints: - gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 + max: &id006 {horizontal: true, value: 6.0} + min: *id006 + preferred: *id006 grow: 0.0 - {} count: 2 @@ -35,11 +35,11 @@ componentConstrains: spanX: INF vertical: gapAfter: - min: &id005 {horizontal: false, value: 12.0} - preferred: *id005 + min: &id007 {horizontal: false, value: 12.0} + preferred: *id007 gapBefore: - min: &id006 {horizontal: false, value: 12.0} - preferred: *id006 + min: &id008 {horizontal: false, value: 12.0} + preferred: *id008 wrap: true Sudo password [label]: {} 'JPasswordField #2': @@ -56,9 +56,9 @@ componentConstrains: spanX: INF vertical: gapAfter: - min: &id007 {horizontal: false, value: 12.0} - preferred: *id007 + min: &id009 {horizontal: false, value: 12.0} + preferred: *id009 gapBefore: - min: &id008 {horizontal: false, value: 20.0} - preferred: *id008 + min: &id010 {horizontal: false, value: 20.0} + preferred: *id010 wrap: true \ No newline at end of file diff --git a/platform/platform-tests/testData/ui/layout/sample configurable panel.yml b/platform/platform-tests/testData/ui/layout/sample configurable panel.yml index 8cb7ad1f4fa3..838c90932601 100644 --- a/platform/platform-tests/testData/ui/layout/sample configurable panel.yml +++ b/platform/platform-tests/testData/ui/layout/sample configurable panel.yml @@ -8,72 +8,72 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} + - align: &id005 {horizontal: false, unit: -1, value: 0.0} noGrid: true - - align: *id003 - - align: *id003 - - align: *id003 + - align: *id005 + - align: *id005 + - align: *id005 gapAfter: - max: &id004 {horizontal: true, value: 20.0} - min: *id004 - preferred: *id004 - - align: *id003 - noGrid: true - - align: *id003 - - align: *id003 - gapAfter: - max: &id005 {horizontal: true, value: 8.0} - min: *id005 - preferred: *id005 - - align: *id003 - - align: *id003 - - align: *id003 - gapAfter: - max: &id006 {horizontal: true, value: 8.0} + max: &id006 {horizontal: true, value: 20.0} min: *id006 preferred: *id006 - - align: *id003 + - align: *id005 + noGrid: true + - align: *id005 + - align: *id005 gapAfter: - max: &id007 {horizontal: true, value: 6.0} + max: &id007 {horizontal: true, value: 8.0} min: *id007 preferred: *id007 - - align: *id003 - - align: *id003 - - align: *id003 + - align: *id005 + - align: *id005 + - align: *id005 gapAfter: - max: &id008 {horizontal: true, value: 20.0} + max: &id008 {horizontal: true, value: 8.0} min: *id008 preferred: *id008 - - align: *id003 - noGrid: true - - align: *id003 - - align: *id003 + - align: *id005 gapAfter: max: &id009 {horizontal: true, value: 6.0} min: *id009 preferred: *id009 - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 + - align: *id005 + - align: *id005 + - align: *id005 gapAfter: max: &id010 {horizontal: true, value: 20.0} min: *id010 preferred: *id010 + - align: *id005 + noGrid: true + - align: *id005 + - align: *id005 + gapAfter: + max: &id011 {horizontal: true, value: 6.0} + min: *id011 + preferred: *id011 + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 + gapAfter: + max: &id012 {horizontal: true, value: 20.0} + min: *id012 + preferred: *id012 - {} count: 22 columnConstraints: constraints: - gapAfter: - max: &id011 {horizontal: true, value: 6.0} - min: *id011 - preferred: *id011 + max: &id013 {horizontal: true, value: 6.0} + min: *id013 + preferred: *id013 grow: 0.0 - {} count: 2 @@ -85,22 +85,22 @@ componentConstrains: Some test option: horizontal: gapBefore: - min: &id012 {horizontal: true, value: 20.0} - preferred: *id012 + min: &id014 {horizontal: true, value: 20.0} + preferred: *id014 spanX: INF wrap: true Another test option: horizontal: gapBefore: - min: &id013 {horizontal: true, value: 20.0} - preferred: *id013 + min: &id015 {horizontal: true, value: 20.0} + preferred: *id015 spanX: INF wrap: true 'JPanel #3': horizontal: gapBefore: - min: &id014 {horizontal: true, value: 20.0} - preferred: *id014 + min: &id016 {horizontal: true, value: 20.0} + preferred: *id016 spanX: INF wrap: true Options [titledSeparator]: @@ -110,36 +110,36 @@ componentConstrains: Radio group [label]: horizontal: gapBefore: - min: &id015 {horizontal: true, value: 20.0} - preferred: *id015 + min: &id017 {horizontal: true, value: 20.0} + preferred: *id017 spanX: INF wrap: true Option 1: horizontal: gapBefore: - min: &id016 {horizontal: true, value: 40.0} - preferred: *id016 + min: &id018 {horizontal: true, value: 40.0} + preferred: *id018 spanX: INF wrap: true Option 2: horizontal: gapBefore: - min: &id017 {horizontal: true, value: 40.0} - preferred: *id017 + min: &id019 {horizontal: true, value: 40.0} + preferred: *id019 spanX: INF wrap: true Comment for the Option 1 [label]: horizontal: gapBefore: - min: &id018 {horizontal: true, value: 60.0} - preferred: *id018 + min: &id020 {horizontal: true, value: 60.0} + preferred: *id020 spanX: INF wrap: true 'JPanel #13': horizontal: gapBefore: - min: &id019 {horizontal: true, value: 20.0} - preferred: *id019 + min: &id021 {horizontal: true, value: 20.0} + preferred: *id021 spanX: INF wrap: true Test [titledSeparator]: @@ -149,8 +149,8 @@ componentConstrains: Header [label]: horizontal: gapBefore: - min: &id020 {horizontal: true, value: 20.0} - preferred: *id020 + min: &id022 {horizontal: true, value: 20.0} + preferred: *id022 'JTextField #16': horizontal: {grow: 100.0} spanX: INF @@ -158,8 +158,8 @@ componentConstrains: Longer Header [label]: horizontal: gapBefore: - min: &id021 {horizontal: true, value: 20.0} - preferred: *id021 + min: &id023 {horizontal: true, value: 20.0} + preferred: *id023 Some long description: {spanX: INF, wrap: true} Comment for the checkbox with longer header. [label]: horizontal: @@ -175,7 +175,7 @@ componentConstrains: 'JPanel #24': horizontal: gapBefore: - min: &id022 {horizontal: true, value: 20.0} - preferred: *id022 + min: &id024 {horizontal: true, value: 20.0} + preferred: *id024 spanX: INF wrap: true \ No newline at end of file diff --git a/platform/platform-tests/testData/ui/layout/scrollPaneNoGrow.yml b/platform/platform-tests/testData/ui/layout/scrollPaneNoGrow.yml index de46e0ffa5dd..393c8b84c5c7 100644 --- a/platform/platform-tests/testData/ui/layout/scrollPaneNoGrow.yml +++ b/platform/platform-tests/testData/ui/layout/scrollPaneNoGrow.yml @@ -8,14 +8,14 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} - - align: *id003 + - align: &id005 {horizontal: false, unit: -1, value: 0.0} + - align: *id005 count: 2 columnConstraints: constraints: diff --git a/platform/platform-tests/testData/ui/layout/subRowsIndent.yml b/platform/platform-tests/testData/ui/layout/subRowsIndent.yml index 9752b94658f0..cd0d5f80dc9d 100644 --- a/platform/platform-tests/testData/ui/layout/subRowsIndent.yml +++ b/platform/platform-tests/testData/ui/layout/subRowsIndent.yml @@ -8,25 +8,25 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 + - align: &id005 {horizontal: false, unit: -1, value: 0.0} + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 count: 6 columnConstraints: constraints: - gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 + max: &id006 {horizontal: true, value: 6.0} + min: *id006 + preferred: *id006 grow: 0.0 - {} count: 2 @@ -37,15 +37,15 @@ componentConstrains: Bar 1 [label]: horizontal: gapBefore: - min: &id005 {horizontal: true, value: 20.0} - preferred: *id005 + min: &id007 {horizontal: true, value: 20.0} + preferred: *id007 spanX: INF wrap: true Two [label]: {spanX: INF, wrap: true} Bar 2 [label]: horizontal: gapBefore: - min: &id006 {horizontal: true, value: 40.0} - preferred: *id006 + min: &id008 {horizontal: true, value: 40.0} + preferred: *id008 spanX: INF wrap: true \ No newline at end of file diff --git a/platform/platform-tests/testData/ui/layout/titled row.yml b/platform/platform-tests/testData/ui/layout/titled row.yml index 61052a241324..6ea3d49c2531 100644 --- a/platform/platform-tests/testData/ui/layout/titled row.yml +++ b/platform/platform-tests/testData/ui/layout/titled row.yml @@ -8,29 +8,29 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} + - align: &id005 {horizontal: false, unit: -1, value: 0.0} noGrid: true - - align: *id003 - - align: *id003 - - align: *id003 + - align: *id005 + - align: *id005 + - align: *id005 gapAfter: - max: &id004 {horizontal: true, value: 20.0} - min: *id004 - preferred: *id004 + max: &id006 {horizontal: true, value: 20.0} + min: *id006 + preferred: *id006 - {} count: 5 columnConstraints: constraints: - gapAfter: - max: &id005 {horizontal: true, value: 6.0} - min: *id005 - preferred: *id005 + max: &id007 {horizontal: true, value: 6.0} + min: *id007 + preferred: *id007 grow: 0.0 - {} count: 2 @@ -42,8 +42,8 @@ componentConstrains: Default notebook name [label]: horizontal: gapBefore: - min: &id006 {horizontal: true, value: 20.0} - preferred: *id006 + min: &id008 {horizontal: true, value: 20.0} + preferred: *id008 'JTextField #2': horizontal: {grow: 100.0} spanX: INF @@ -51,8 +51,8 @@ componentConstrains: Spark version [label]: horizontal: gapBefore: - min: &id007 {horizontal: true, value: 20.0} - preferred: *id007 + min: &id009 {horizontal: true, value: 20.0} + preferred: *id009 'JTextField #4': horizontal: {grow: 100.0} spanX: INF @@ -60,7 +60,7 @@ componentConstrains: 'JPanel #5': horizontal: gapBefore: - min: &id008 {horizontal: true, value: 20.0} - preferred: *id008 + min: &id010 {horizontal: true, value: 20.0} + preferred: *id010 spanX: INF wrap: true \ No newline at end of file diff --git a/platform/platform-tests/testData/ui/layout/titled rows.yml b/platform/platform-tests/testData/ui/layout/titled rows.yml index ad35cff83d0c..9bef7531841c 100644 --- a/platform/platform-tests/testData/ui/layout/titled rows.yml +++ b/platform/platform-tests/testData/ui/layout/titled rows.yml @@ -8,53 +8,53 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} + - align: &id005 {horizontal: false, unit: -1, value: 0.0} noGrid: true - - align: *id003 - - align: *id003 + - align: *id005 + - align: *id005 gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 - - align: *id003 - - align: *id003 - gapAfter: - max: &id005 {horizontal: true, value: 6.0} - min: *id005 - preferred: *id005 - - align: *id003 - - align: *id003 - gapAfter: - max: &id006 {horizontal: true, value: 20.0} + max: &id006 {horizontal: true, value: 6.0} min: *id006 preferred: *id006 - - align: *id003 - noGrid: true - - align: *id003 + - align: *id005 + - align: *id005 gapAfter: max: &id007 {horizontal: true, value: 6.0} min: *id007 preferred: *id007 - - align: *id003 - - align: *id003 + - align: *id005 + - align: *id005 gapAfter: max: &id008 {horizontal: true, value: 20.0} min: *id008 preferred: *id008 + - align: *id005 + noGrid: true + - align: *id005 + gapAfter: + max: &id009 {horizontal: true, value: 6.0} + min: *id009 + preferred: *id009 + - align: *id005 + - align: *id005 + gapAfter: + max: &id010 {horizontal: true, value: 20.0} + min: *id010 + preferred: *id010 - {} count: 12 columnConstraints: constraints: - gapAfter: - max: &id009 {horizontal: true, value: 6.0} - min: *id009 - preferred: *id009 + max: &id011 {horizontal: true, value: 6.0} + min: *id011 + preferred: *id011 grow: 0.0 - {} count: 2 @@ -66,15 +66,15 @@ componentConstrains: 'HyperlinkLabel #1': horizontal: gapBefore: - min: &id010 {horizontal: true, value: 20.0} - preferred: *id010 + min: &id012 {horizontal: true, value: 20.0} + preferred: *id012 spanX: INF wrap: true Agent path [label]: horizontal: gapBefore: - min: &id011 {horizontal: true, value: 20.0} - preferred: *id011 + min: &id013 {horizontal: true, value: 20.0} + preferred: *id013 'TextFieldWithBrowseButton #3': horizontal: grow: 100.0 @@ -84,15 +84,15 @@ componentConstrains: wrap: true If field is empty bundled agent will be used [label]: horizontal: - gapBefore: &id013 {} + gapBefore: &id015 {} skip: 1 spanX: INF wrap: true Agent options [label]: horizontal: gapBefore: - min: &id012 {horizontal: true, value: 20.0} - preferred: *id012 + min: &id014 {horizontal: true, value: 20.0} + preferred: *id014 'TextFieldWithBrowseButton #6': horizontal: grow: 100.0 @@ -102,15 +102,15 @@ componentConstrains: wrap: true Don't add output format (collapsed is used) or output file options [label]: horizontal: - gapBefore: *id013 + gapBefore: *id015 skip: 1 spanX: INF wrap: true 'JPanel #8': horizontal: gapBefore: - min: &id014 {horizontal: true, value: 20.0} - preferred: *id014 + min: &id016 {horizontal: true, value: 20.0} + preferred: *id016 spanX: INF wrap: true Java Flight Recorder [titledSeparator]: @@ -120,8 +120,8 @@ componentConstrains: JRE home [label]: horizontal: gapBefore: - min: &id015 {horizontal: true, value: 20.0} - preferred: *id015 + min: &id017 {horizontal: true, value: 20.0} + preferred: *id017 'TextFieldWithBrowseButton #11': horizontal: grow: 100.0 @@ -131,14 +131,14 @@ componentConstrains: wrap: true At least OracleJRE 9 or OpenJRE 11 is required to import dump [label]: horizontal: - gapBefore: *id013 + gapBefore: *id015 skip: 1 spanX: INF wrap: true 'JPanel #13': horizontal: gapBefore: - min: &id016 {horizontal: true, value: 20.0} - preferred: *id016 + min: &id018 {horizontal: true, value: 20.0} + preferred: *id018 spanX: INF wrap: true \ No newline at end of file diff --git a/platform/platform-tests/testData/ui/layout/vertical buttons.yml b/platform/platform-tests/testData/ui/layout/vertical buttons.yml index c711c93121a9..9b5669a3a336 100644 --- a/platform/platform-tests/testData/ui/layout/vertical buttons.yml +++ b/platform/platform-tests/testData/ui/layout/vertical buttons.yml @@ -8,21 +8,21 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} - - align: *id003 + - align: &id005 {horizontal: false, unit: -1, value: 0.0} + - align: *id005 count: 2 columnConstraints: constraints: - gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 + max: &id006 {horizontal: true, value: 6.0} + min: *id006 + preferred: *id006 - {} count: 2 componentConstrains: diff --git a/platform/platform-tests/testData/ui/layout/visual paddings.yml b/platform/platform-tests/testData/ui/layout/visual paddings.yml index 115a5918281d..578142a4a9a1 100644 --- a/platform/platform-tests/testData/ui/layout/visual paddings.yml +++ b/platform/platform-tests/testData/ui/layout/visual paddings.yml @@ -8,30 +8,30 @@ layoutConstraints: preferred: *id002 hideMode: 2 insets: - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} - - {horizontal: false, unit: 0, value: 0.0} - - {horizontal: true, unit: 0, value: 0.0} + - &id003 {horizontal: false, unit: 0, value: 0.0} + - &id004 {horizontal: true, unit: 0, value: 0.0} + - *id003 + - *id004 rowConstraints: constraints: - - align: &id003 {horizontal: false, unit: -1, value: 0.0} - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 - - align: *id003 + - align: &id005 {horizontal: false, unit: -1, value: 0.0} + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 + - align: *id005 count: 11 columnConstraints: constraints: - gapAfter: - max: &id004 {horizontal: true, value: 6.0} - min: *id004 - preferred: *id004 + max: &id006 {horizontal: true, value: 6.0} + min: *id006 + preferred: *id006 grow: 0.0 - {} count: 2 @@ -86,8 +86,8 @@ componentConstrains: vertical: align: {horizontal: false, unit: 6, value: 0.0} gapBefore: - min: &id005 {horizontal: false, value: 1.0} - preferred: *id005 + min: &id007 {horizontal: false, value: 1.0} + preferred: *id007 'JBScrollPane #26': horizontal: {grow: 100.0} pushY: 100.0