-
Notifications
You must be signed in to change notification settings - Fork 274
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.
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
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
1b40405
Update ActionToolbar's layout strategy
samgst-amazon 7fac34f
changelog
samgst-amazon 91042d6
IDE versioning logic for layout strategy/policy
samgst-amazon 1da8a5a
IDE versioning logic for layout strategy/policy
samgst-amazon 4962d94
Merge remote-tracking branch 'origin/samgst/FixToolkitConnectionDropd…
samgst-amazon b56e781
Refactor toolbar creation in AwsToolkitExplorerToolWindow & simplify …
samgst-amazon 1a8abcc
Layout policy/strategy util class further slimmed down
samgst-amazon e651a5e
implement new util class
samgst-amazon 92b6156
Change util from object to function only
samgst-amazon f28e349
Change util from object to function only
samgst-amazon 35c44c1
Merge remote-tracking branch 'origin/samgst/FixToolkitConnectionDropd…
samgst-amazon b0cc133
renamed function to be version agnostic
samgst-amazon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
4 changes: 4 additions & 0 deletions
4
.changes/next-release/bugfix-d171c0a8-83d8-4dab-8499-d402939d7c38.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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." | ||
| } |
34 changes: 34 additions & 0 deletions
34
...e/src-233/software/aws/toolkits/jetbrains/core/explorer/ConnectionActionToolbarBuilder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| // 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.ActionManager | ||
| import com.intellij.openapi.actionSystem.ActionPlaces | ||
| import com.intellij.openapi.actionSystem.DefaultActionGroup | ||
| import com.intellij.util.ui.components.BorderLayoutPanel | ||
|
|
||
| object ConnectionActionToolbarBuilder { | ||
| fun createToolbar(toolWindow: AwsToolkitExplorerToolWindow, group: DefaultActionGroup): BorderLayoutPanel { | ||
| return BorderLayoutPanel().apply { | ||
| addToCenter( | ||
| ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, group, true).apply { | ||
| layoutPolicy = ActionToolbar.NOWRAP_LAYOUT_POLICY | ||
| setTargetComponent(toolWindow) | ||
| }.component | ||
| ) | ||
|
|
||
| val actionManager = ActionManager.getInstance() | ||
| val rightActionGroup = DefaultActionGroup( | ||
| actionManager.getAction("aws.toolkit.toolwindow.credentials.rightGroup.more"), | ||
| actionManager.getAction("aws.toolkit.toolwindow.credentials.rightGroup.help") | ||
| ) | ||
|
|
||
| addToRight( | ||
| ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, rightActionGroup, true).apply { | ||
| setTargetComponent(toolWindow.component) | ||
| }.component | ||
| ) | ||
| } | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
.../src-241+/software/aws/toolkits/jetbrains/core/explorer/ConnectionActionToolbarBuilder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // 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.ActionManager | ||
| import com.intellij.openapi.actionSystem.ActionPlaces | ||
| import com.intellij.openapi.actionSystem.ActionToolbar | ||
| import com.intellij.openapi.actionSystem.DefaultActionGroup | ||
| import com.intellij.openapi.actionSystem.toolbarLayout.ToolbarLayoutStrategy | ||
| import com.intellij.util.ui.components.BorderLayoutPanel | ||
|
|
||
| object ConnectionActionToolbarBuilder { | ||
| fun createToolbar(toolWindow: AwsToolkitExplorerToolWindow, group: DefaultActionGroup): BorderLayoutPanel { | ||
| return BorderLayoutPanel().apply { | ||
| addToCenter( | ||
| ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, group, true).apply { | ||
| layoutStrategy = ToolbarLayoutStrategy.NOWRAP_STRATEGY | ||
| setTargetComponent(toolWindow) | ||
| }.component | ||
| ) | ||
|
|
||
| val actionManager = ActionManager.getInstance() | ||
| val rightActionGroup = DefaultActionGroup( | ||
| actionManager.getAction("aws.toolkit.toolwindow.credentials.rightGroup.more"), | ||
| actionManager.getAction("aws.toolkit.toolwindow.credentials.rightGroup.help") | ||
| ) | ||
|
|
||
| addToRight( | ||
| ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, rightActionGroup, true).apply { | ||
| setTargetComponent(toolWindow.component) | ||
| }.component | ||
| ) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since only this section differs across the versions, can we move the creation of this component to the util file and retain the creation for the panel in the init block of AWSToolkitExplorerToolWindow?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done & done, Thanks for the feedback :)