Merge remote-tracking branch 'origin/samgst/FixToolkitConnectionDropdown' into samgst/FixToolkitConnectionDropdown

samgst-amazon · samgst-amazon · commit 35c44c1e5357 · 2024-10-04T16:27:44.000-07:00
# Conflicts:
#	plugins/toolkit/jetbrains-core/src-233/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt
#	plugins/toolkit/jetbrains-core/src-241+/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt
#	plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerToolWindow.kt
diff --git a/plugins/toolkit/jetbrains-core/src-233/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt b/plugins/toolkit/jetbrains-core/src-233/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt
@@ -5,7 +5,7 @@ package software.aws.toolkits.jetbrains.core.explorer
 import com.intellij.openapi.actionSystem.ActionToolbar
 
 
-fun setToolbarLayout(toolbar: ActionToolbar) {
+fun setToolbarLayoutPolicy(toolbar: ActionToolbar) {
     toolbar.layoutPolicy = ActionToolbar.NOWRAP_LAYOUT_POLICY
 }
 
diff --git a/plugins/toolkit/jetbrains-core/src-241+/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt b/plugins/toolkit/jetbrains-core/src-241+/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt
@@ -5,6 +5,6 @@ package software.aws.toolkits.jetbrains.core.explorer
 import com.intellij.openapi.actionSystem.ActionToolbar
 import com.intellij.openapi.actionSystem.toolbarLayout.ToolbarLayoutStrategy
 
-fun setToolbarLayout(toolbar: ActionToolbar) {
+fun setToolbarLayoutPolicy(toolbar: ActionToolbar) {
     toolbar.layoutStrategy = ToolbarLayoutStrategy.NOWRAP_STRATEGY
 }
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerToolWindow.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerToolWindow.kt
@@ -67,7 +67,7 @@ class AwsToolkitExplorerToolWindow(
                 val actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, group, true).apply {
                     setTargetComponent(this@AwsToolkitExplorerToolWindow)
                 }
-                setToolbarLayout(actionToolbar)
+                setToolbarLayoutPolicy(actionToolbar)
                 addToCenter(actionToolbar.component)
 
                 val actionManager = ActionManager.getInstance()

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ package software.aws.toolkits.jetbrains.core.explorer`
`5`	`5`	`import com.intellij.openapi.actionSystem.ActionToolbar`
`6`	`6`
`7`	`7`
`8`		`-fun setToolbarLayout(toolbar: ActionToolbar) {`
	`8`	`+fun setToolbarLayoutPolicy(toolbar: ActionToolbar) {`
`9`	`9`	`toolbar.layoutPolicy = ActionToolbar.NOWRAP_LAYOUT_POLICY`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ package software.aws.toolkits.jetbrains.core.explorer`
`5`	`5`	`import com.intellij.openapi.actionSystem.ActionToolbar`
`6`	`6`	`import com.intellij.openapi.actionSystem.toolbarLayout.ToolbarLayoutStrategy`
`7`	`7`
`8`		`-fun setToolbarLayout(toolbar: ActionToolbar) {`
	`8`	`+fun setToolbarLayoutPolicy(toolbar: ActionToolbar) {`
`9`	`9`	`toolbar.layoutStrategy = ToolbarLayoutStrategy.NOWRAP_STRATEGY`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class AwsToolkitExplorerToolWindow(`
`67`	`67`	`val actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, group, true).apply {`
`68`	`68`	`setTargetComponent(this@AwsToolkitExplorerToolWindow)`
`69`	`69`	`}`
`70`		`- setToolbarLayout(actionToolbar)`
	`70`	`+ setToolbarLayoutPolicy(actionToolbar)`
`71`	`71`	`addToCenter(actionToolbar.component)`
`72`	`72`
`73`	`73`	`val actionManager = ActionManager.getInstance()`