Unify Window struct across backends #162
Merged
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.
The public
Window
struct holds a mutable reference toplatform::Window
, which is a pattern that doesn't make sense for all backends. On Windows, theplatform::Window
struct itself just holds another (immutable) reference, and on macOS theplatform::Window
struct has to be wrapped in aRefCell
so that a mutable reference to it can be formed.Change the public
Window
struct to holdplatform::Window
directly, and changeplatform::Window
in the macOS and X11 backends so that it simply holds a reference to anotherWindowInner
struct similarly to the Windows backend. This allows us to remove the platform conditional in the declaration of the top-levelWindow
struct. It also allows us to remove theRefCell
wrappingplatform::Window
in the macOS backend and replace it withCell
s wrapping its individual fields.