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.

Sign up for GitHub

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

Jump to bottom

Back-port resolution to #6544 #6790

Merged
merged 5 commits into from Jun 22, 2022
Merged

Back-port resolution to #6544 #6790

merged 5 commits into from Jun 22, 2022

Conversation

Wedge009
Copy link
Member

@Wedge009 Wedge009 commented Jun 22, 2022 •
edited

Apply theme corrections for 1.16 branch as well.

@mesilliac @Wedge009
Fix "End Turn" button placement on low-res themes.
34b8290 
Fixes wesnoth#6544.

I am not sure how this was even remotely working as it was.

(cherry picked from commit 91fd53a)
@mesilliac @Wedge009
Fix low-res editor themes.
bb42dff 
Fixes wesnoth#5620.

(cherry picked from commit 9615236)
@mesilliac @Wedge009
Fix low-res themes during replay.
cbcc1d7 
This was mentioned as a comment in wesnoth#5620.

(cherry picked from commit 8380e01)
@mesilliac @Wedge009
Fix wmlindent complaint.
6e3d4e4 
(cherry picked from commit cf4c265)
@Wedge009 Wedge009 added the UI User interface issues, including both back-end and front-end issues. label Jun 22, 2022
@Wedge009 Wedge009 mentioned this pull request Jun 22, 2022
Closed
@mesilliac
Copy link
Contributor

I just tested briefly, this seems to be working as expected for editor, replays, and end turn button.

I also forgot to add changelog entries, it could use one for #6544 and also for #5620

@Wedge009 Wedge009 merged commit b9268c8 into wesnoth:1.16 Jun 22, 2022
@Wedge009 Wedge009 deleted the backport_6544 branch June 22, 2022 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
UI User interface issues, including both back-end and front-end issues.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Wedge009 @mesilliac