Skip to content
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

Hint/Inspection panel and dialog layout fixes #3472

Merged
merged 2 commits into from
Jan 19, 2022

Conversation

mbien
Copy link
Member

@mbien mbien commented Jan 18, 2022

  • source -> inspect dialog did not resize properly
  • refactor -> inspect and refactor dialog had no separation between row two and three (very similar dialog to the one above but uses a different layout manager :) )
  • layout fixes to HintPanel as used in options -> editor -> hints or from various configuration dialogs
    • description resizes now vertically, required updates to many customizer components so that they only take as much space as they need
    • made dialogs which use the HintPanel a little larger

@mbien mbien added kind:bug Bug report or fix Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form) UI User Interface labels Jan 18, 2022
@mbien mbien added this to the NB13 milestone Jan 18, 2022
@neilcsmith-net neilcsmith-net changed the base branch from master to delivery January 18, 2022 11:04
@neilcsmith-net neilcsmith-net added the do not merge Don't merge this PR, it is not ready or just demonstration purposes. label Jan 18, 2022
@neilcsmith-net
Copy link
Member

@mbien need to rebase on delivery if you want this in NB13 - picking up commits from master we don't want.

@matthiasblaesing
Copy link
Contributor

In this case we don't want a rebase, but a cherry-pick. The difference is, that rebase will carry all commits from the base branch, that are not in the target branch, while cherry-picking only uses the referenced commits.

mbien added 2 commits January 18, 2022 19:13
 - inspect dialog did not properly resize
 - refactor dialog had no separation between two rows
 - description panel is now using all vertical space
 - required fixes to the customizer panels so that they only use the space
   they actually need
 - made the dialogs which use the hint panel a bit larger
@mbien
Copy link
Member Author

mbien commented Jan 18, 2022

@neilcsmith-net done

@matthiasblaesing yeah that is correct. Although I did cherry pick to delivery, I still refer to it as "rebasing the two commits to delivery" myself - I probably shouldn't since it could be taken literally.

@neilcsmith-net
Copy link
Member

@mbien thanks.

@matthiasblaesing yes, rebasing was more a turn of phrase around changing the PR base branch. Mind you, still prefer using git rebase for this task myself, but don't mind how anyone wants to clean up their PR unless they need help with it. Now, as long as we don't get cherry-picking from upstream master I'm happy ... 😄

@neilcsmith-net neilcsmith-net removed the do not merge Don't merge this PR, it is not ready or just demonstration purposes. label Jan 19, 2022
@neilcsmith-net neilcsmith-net merged commit 335fe27 into apache:delivery Jan 19, 2022
mbien added a commit to mbien/netbeans that referenced this pull request Nov 2, 2022
 - analog to apache#3472, this fixes UI component resize behavior
 - description panel is now filling the space vertically like in the
   java version of this panel. Text is now wrapping properly.
 - the option panels had to be adjusted to prefer their minimum default
   size
 - minor language cleanup: diamonds, lambdas
mbien added a commit to mbien/netbeans that referenced this pull request Nov 8, 2022
 - analog to apache#3472, this fixes UI component resize behavior
 - updated all other HintsPanels to have the same initial divider pos
 - minor cleanup like lambdas and diamonds
Chris2011 pushed a commit to Chris2011/netbeans that referenced this pull request Dec 15, 2022
 - analog to apache#3472, this fixes UI component resize behavior
 - description panel is now filling the space vertically like in the
   java version of this panel. Text is now wrapping properly.
 - the option panels had to be adjusted to prefer their minimum default
   size
 - minor language cleanup: diamonds, lambdas
Chris2011 pushed a commit to Chris2011/netbeans that referenced this pull request Dec 15, 2022
 - analog to apache#3472, this fixes UI component resize behavior
 - updated all other HintsPanels to have the same initial divider pos
 - minor cleanup like lambdas and diamonds
pepness pushed a commit to pepness/incubator-netbeans that referenced this pull request Jan 9, 2023
 - analog to apache#3472, this fixes UI component resize behavior
 - description panel is now filling the space vertically like in the
   java version of this panel. Text is now wrapping properly.
 - the option panels had to be adjusted to prefer their minimum default
   size
 - minor language cleanup: diamonds, lambdas
pepness pushed a commit to pepness/incubator-netbeans that referenced this pull request Jan 9, 2023
 - analog to apache#3472, this fixes UI component resize behavior
 - updated all other HintsPanels to have the same initial divider pos
 - minor cleanup like lambdas and diamonds
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form) kind:bug Bug report or fix UI User Interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants