Skip to content

WinForms and Android refactor for Container#4484

Merged
kattni merged 19 commits into
beeware:mainfrom
johnzhou721:winforms-android
Jun 24, 2026
Merged

WinForms and Android refactor for Container#4484
kattni merged 19 commits into
beeware:mainfrom
johnzhou721:winforms-android

Conversation

@johnzhou721

Copy link
Copy Markdown
Contributor

Container and Windowss on Winforms and Android now uses a "has-a" relationship instead of a "is-a" relationship. This will simplify scaffold implementation later, as there's an additioanl layer that manages containers.

Refs #4382.

PR Checklist:

  • I will abide by the BeeWare Code of Conduct
  • I have read and have followed the CONTRIBUTING.md file
  • This PR was generated or assisted using an AI tool

Assisted-by:

@johnzhou721 johnzhou721 marked this pull request as ready for review June 19, 2026 03:42
@kattni

kattni commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@johnzhou721 Please merge main into this PR. The docs failure is due to an update that isn't currently included here.

Tag me when you've done so. Thank you.

@johnzhou721

Copy link
Copy Markdown
Contributor Author

@kattni I've merged with main; thanks.

@kattni kattni requested a review from phildini June 22, 2026 02:20

@phildini phildini left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems reasonable; is it truly the case that no tests are needed here?

@johnzhou721

johnzhou721 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

@phildini

This seems reasonable; is it truly the case that no tests are needed here?

First off, thank you for taking the time to review this pull request and suggest the addition of new tests.

I believe that there should not be a need for additional tests, as these are merely changes in the internal structure of how Window is handled, rather than new behaviors; existing behaviors related to Container would all be covered in existing tests.

If there is anything else you would like to see tested, please let me know so I can add them.

@kattni kattni left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you for following up. One minor change applied.

Comment thread changes/4484.misc.md Outdated
@kattni

kattni commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

setuptools_scm had a dependency update that required it be updated for compatibility. Update pushed.

@freakboy3742

Copy link
Copy Markdown
Member

The setuptools_scm issues turned into a bigger problem; see #4498 for the updates required.

@johnzhou721

Copy link
Copy Markdown
Contributor Author

@kattni I'm seeing merge conflicts here; unfortunately I do not have an idea of the additional changes that has been pushed to this PR. If I understand, anything after de02db0 has been moved to #4498. Is that correct? If so, I'll hard reset to de02db0 and then force push here.

@kattni

kattni commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

@johnzhou721 I've merged main and pushed. Letting CI run now.

@kattni kattni merged commit e9cdbdb into beeware:main Jun 24, 2026
64 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.

4 participants