Join GitHub today
unit preview pane backports #4394
Following these two backports:
We also need to:
The "show damage type and range icons" issues have been collected here: https://github.com/wesnoth/wesnoth/projects/4
Here are the commit messages of some relevant commits. I believe the first ten are from master. I am not sure about the last five: I think they too are from master, but it's possible some of them are commits that were pushed to one of the PRs on https://github.com/wesnoth/wesnoth/projects/4 and were subsequently history rewritten before merge.
I don't have the hashes immediately available.
What happened here is that 5aaf179 was committed to master and then backported. The backport conflicted so @Vultraz backported two commits that were necessary to fix the conflicts. However, those two commits were part of a larger feature, so either all of the feature should be backported (the blade.png thing because otherwise the UI looks broken, and the rest because there'll be no reason not to backport it once we've backported the first part), or those two commits should be reverted.
I agree with you that it would be easier/better to revert those two commits than to backport the rest of the feature.
Nonetheless, is no particular reason to revert the backport of 5aaf179 (ec3b2fb). That commit simply changed the whitespace in the unit preview pane (see screenshots in the spoiler). That change is reasonable (which is not the same as saying I agree with it aesthetically - I don't - but that's neither here nor there), and could make sense for 1.14 independently of the damage type and range icons.
However, because Vultraz's change and the damage type and range icon changes conflict with each other, what I recommend to do is two steps:
This way, Vultraz's change stays in but the other two commits stay out. (It bears mentioning that when those two commits were added to master, they were intentionally not backported, but nobody told Vultraz that was the case.)
edit: Added 967d979 to the instructions
@Vultraz Looking at the screenshots in my last post, does the vertical placement of the red/black icons look right to you? Previously the layout had the red/black icons vertically aligned with a letter that had both an ascender and a descender, but now, the bottom of the icon is aligned with the baseline of the text (the horizontal stroke of the