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

Introduce WINDOW_SHIM define #11653

Merged
merged 8 commits into from
May 10, 2020

Conversation

Gymnasiast
Copy link
Member

Taken from #10133. It does not include the ifdefs to move the close box to the left, as that bit needs a rethink anyway.

@IntelOrca
Copy link
Contributor

For moving the close box. Well all windows (some probably already do) should be calling a common method for resizing those skeleton (or shim as I call them) widgets. In that common method, it could change the position of the close button based on user preference.

@Gymnasiast
Copy link
Member Author

It was my intention to create such a function, yes, especially since it avoids a lot of code duplication, even without the left/right handling. Is it ok if I leave that for another PR, or do you want me to address it in this one?

Also, if you think "shim" is a better name than "skeleton": I have no problem changing it.

@IntelOrca
Copy link
Contributor

Is it ok if I leave that for another PR?

Yes, I didn't expect you to do this now.

@Gymnasiast Gymnasiast changed the title Introduce WINDOW_SKELETON define Introduce WINDOW_SHIM define May 9, 2020
Copy link
Member

@tupaschoal tupaschoal left a comment

Choose a reason for hiding this comment

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

Seems ok to me.

I'm not very fond of the abuse of something being static constexpr const, but it does no harm, so go on.

@Gymnasiast Gymnasiast merged commit d5f2168 into OpenRCT2:develop May 10, 2020
@Gymnasiast Gymnasiast deleted the refactor/window-skeleton branch May 10, 2020 09:34
@tupaschoal tupaschoal added this to the v0.2.7 milestone May 10, 2020
Gymnasiast added a commit to Gymnasiast/OpenRCT2 that referenced this pull request May 12, 2020
Text Input uses one colour, specifically the body colour of the calling window. This was previously handles by a modified window shim, but OpenRCT2#11653 changed this and this window now uses the standard window shim. This is why it now needs to change the colour assignment.
Gymnasiast added a commit that referenced this pull request May 12, 2020
Text Input uses one colour, specifically the body colour of the calling window. This was previously handles by a modified window shim, but #11653 changed this and this window now uses the standard window shim. This is why it now needs to change the colour assignment.
rdbaris pushed a commit to rdbaris/OpenRCT2 that referenced this pull request Jun 7, 2020
Text Input uses one colour, specifically the body colour of the calling window. This was previously handles by a modified window shim, but OpenRCT2#11653 changed this and this window now uses the standard window shim. This is why it now needs to change the colour assignment.
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.

5 participants