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

ResolveScenarioWizardDialog - Rebuild as a tabbed dialog, improve UI #5148

Merged
merged 7 commits into from
Oct 29, 2024

Conversation

WeaverThree
Copy link
Collaborator

Includes #5146
Closes #5132

This is a major UI overhauld of the Resolve Scenario Wizard Dialog. It's now a tabbed dialog instead of being based on CardLayout. Highlights:

  • Window will not resize itself while changing between pages
  • Tabs are all visible but they're enabled based on the same criteria that the old panel skipped pages by.
  • Prev/Next still work. They skip disabled tabs.
  • Every page is now formatted the same: centered column of controls flush against the top of the display area, or scrolling if the page is long enough
  • Fixed prior issue of text boxes growing but not shrinking.
  • Code cleaned up, modularized, documented, and generally spiffied up.

There's one piece I haven't figured out: dynamically updating the objectives list based on selections from units and salvage. The code from the old version to do this wipes out all user selections on the objectives list, and so isn't very suitable for a design where the user is more encouraged to go back and forth between pages.

I've included @IllianiCBT's changes from #5146 in the places they live now in the reorganized code. I hope this is acceptable.

2024-10-28_155606
2024-10-28_155609
2024-10-28_155611
2024-10-28_155612
2024-10-28_155614
2024-10-28_155616
2024-10-28_155619

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 10.53%. Comparing base (fb6c52a) to head (97fa784).
Report is 11 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff            @@
##             master    #5148   +/-   ##
=========================================
  Coverage     10.53%   10.53%           
- Complexity     6041     6044    +3     
=========================================
  Files           956      956           
  Lines        134253   134270   +17     
  Branches      19501    19501           
=========================================
+ Hits          14142    14149    +7     
- Misses       118760   118769    +9     
- Partials       1351     1352    +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@HammerGS
Copy link
Member

This as picked up conflicts.

Copy link
Collaborator

@IllianiCBT IllianiCBT left a comment

Choose a reason for hiding this comment

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

Everything looks good, but with something like this we'll want to keep an eye once it's merged to make sure we've not introduced new weirdness.

@WeaverThree
Copy link
Collaborator Author

Conflicts fixed and minor fix made

@HammerGS HammerGS merged commit a077804 into MegaMek:master Oct 29, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[0.50.01-SNAPSHOT] Formatting issue with end-of-scenario resolution objectives window
4 participants