Merge pull request #26 from spbu-coding-2022/layout-fix

sokolovskiy-ilya · web-flow · commit a0b83a892549 · 2023-06-05T12:26:45.000+03:00
Fixed the problem with GroupLayout causing errors
diff --git a/App/src/main/kotlin/app/App.kt b/App/src/main/kotlin/app/App.kt
@@ -384,7 +384,6 @@ private fun menuFrameInit() {
 
     // contentPane - контейнер для компонентов
     val layout = GroupLayout(menuFrame.contentPane)
-    menuFrame.contentPane.layout = layout
 
     layout.autoCreateContainerGaps = true
     layout.autoCreateGaps = true
@@ -438,4 +437,6 @@ private fun menuFrameInit() {
             )
 
     )
+
+    menuFrame.contentPane.layout = layout
 }

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,6 @@ private fun menuFrameInit() {`
`384`	`384`
`385`	`385`	`// contentPane - контейнер для компонентов`
`386`	`386`	`val layout = GroupLayout(menuFrame.contentPane)`
`387`		`- menuFrame.contentPane.layout = layout`
`388`	`387`
`389`	`388`	`layout.autoCreateContainerGaps = true`
`390`	`389`	`layout.autoCreateGaps = true`
`@@ -438,4 +437,6 @@ private fun menuFrameInit() {`
`438`	`437`	`)`
`439`	`438`
`440`	`439`	`)`
	`440`	`+`
	`441`	`+ menuFrame.contentPane.layout = layout`
`441`	`442`	`}`