Skip to content

Fix toolkit connection dropdown hiding when panel is small #4933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 10, 2024
Merged

Fix toolkit connection dropdown hiding when panel is small #4933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1b40405
Update ActionToolbar's layout strategy
samgst-amazon Oct 3, 2024
7fac34f
changelog
samgst-amazon Oct 3, 2024
91042d6
IDE versioning logic for layout strategy/policy
samgst-amazon Oct 3, 2024
1da8a5a
IDE versioning logic for layout strategy/policy
samgst-amazon Oct 3, 2024
4962d94
Merge remote-tracking branch 'origin/samgst/FixToolkitConnectionDropd…
samgst-amazon Oct 3, 2024
b56e781
Refactor toolbar creation in AwsToolkitExplorerToolWindow & simplify …
samgst-amazon Oct 4, 2024
1a8abcc
Layout policy/strategy util class further slimmed down
samgst-amazon Oct 4, 2024
e651a5e
implement new util class
samgst-amazon Oct 4, 2024
92b6156
Change util from object to function only
samgst-amazon Oct 4, 2024
f28e349
Change util from object to function only
samgst-amazon Oct 4, 2024
35c44c1
Merge remote-tracking branch 'origin/samgst/FixToolkitConnectionDropd…
samgst-amazon Oct 4, 2024
b0cc133
renamed function to be version agnostic
samgst-amazon Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-d171c0a8-83d8-4dab-8499-d402939d7c38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Fix toolkit connection dropdown getting hidden when panel width is small."
}
9 changes: 9 additions & 0 deletions ...ins-core/src-233/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package software.aws.toolkits.jetbrains.core.explorer

import com.intellij.openapi.actionSystem.ActionToolbar

fun setToolbarLayout(toolbar: ActionToolbar) {
toolbar.layoutPolicy = ActionToolbar.NOWRAP_LAYOUT_POLICY
}
Comment on lines +3 to +9
Copy link
Contributor

@rli rli Oct 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ToolbarLayoutStrategy doesn't exist in 233, so it would be less overall work if we just aliased
ToolbarLayoutStrategy.NOWRAP_STRATEGY to be ActionToolbar.NOWRAP_LAYOUT_POLICY i n233

10 changes: 10 additions & 0 deletions ...ns-core/src-241+/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package software.aws.toolkits.jetbrains.core.explorer

import com.intellij.openapi.actionSystem.ActionToolbar
import com.intellij.openapi.actionSystem.toolbarLayout.ToolbarLayoutStrategy

fun setToolbarLayout(toolbar: ActionToolbar) {
toolbar.layoutStrategy = ToolbarLayoutStrategy.NOWRAP_STRATEGY
}
12 changes: 5 additions & 7 deletions ...ns-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerToolWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package software.aws.toolkits.jetbrains.core.explorer
import com.intellij.icons.AllIcons
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.ActionPlaces
import com.intellij.openapi.actionSystem.ActionToolbar
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.DefaultActionGroup
Expand Down Expand Up @@ -65,12 +64,11 @@ class AwsToolkitExplorerToolWindow(
val group = CredsComboBoxActionGroup(project)

toolbar = BorderLayoutPanel().apply {
addToCenter(
ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, group, true).apply {
layoutPolicy = ActionToolbar.AUTO_LAYOUT_POLICY
setTargetComponent(this@AwsToolkitExplorerToolWindow)
}.component
)
val actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, group, true).apply {
setTargetComponent(this@AwsToolkitExplorerToolWindow)
}
setToolbarLayout(actionToolbar)
addToCenter(actionToolbar.component)

val actionManager = ActionManager.getInstance()
val rightActionGroup = DefaultActionGroup(
Expand Down
Loading