Skip to content

Split the composite CGA settings from the Settings dialog#7019

Merged
OBattler merged 5 commits into
86Box:masterfrom
lemondrops:patch-67
Apr 7, 2026
Merged

Split the composite CGA settings from the Settings dialog#7019
OBattler merged 5 commits into
86Box:masterfrom
lemondrops:patch-67

Conversation

@lemondrops

Copy link
Copy Markdown
Contributor

Summary

Splits the composite CGA settings from the Settings dialog into its own dialog, reverting things to how they were before the preferences overhaul.
Also reverts the pause on settings dialog changes.
Drive-by: remove the Apply button from the composite CGA settings dialog as it is redundant with the OK button.

Checklist

  • Closes #xxx
  • I have tested my changes locally and validated that the functionality works as intended
  • I have discussed this with core contributors already
  • This pull request requires changes to the ROM set
  • This pull request requires changes to the asset set

References

N/A

…y page, hide it if the current monitor is not composite, and remove the old CGA composite settings dialog."

Partially revert "The current state of the Preferences overhaul."

This reverts commit c54c879 and partially reverts commit 308da7e.
@OBattler OBattler merged commit ccb4941 into 86Box:master Apr 7, 2026
45 checks passed
@lemondrops lemondrops deleted the patch-67 branch April 7, 2026 19:58
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.

2 participants