Modified Button Layout to be similar to OG #9385
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
felix642
force-pushed
the
I1355-button-layout
branch
from
d0c068e to
9c8b94b
Compare
Districh-ru
added
improvement
There was a problem hiding this comment.
Hi, @felix642, I left two code style related comments.
Could you please take a look when you have time.
|
@felix642. Thanks for improving the UI. I'm wondering, have you checked these changes with other languages, especially Spanish and German? |
No, I did not realize the size of the buttons would change depending on the selected language. I just had a quick look and everything looks good IMO.
|
|
This pull request will not be merged till 1.1.5 release as it touches many in-game dialogs which we need to test. |
| case Dialog::YES | Dialog::NO: | ||
| offset.x = area.x; | ||
| case Dialog::YES | Dialog::NO: { | ||
| const int32_t horizontalFreeSpace = area.width - AGG::GetICN( buttonYesIcnID, 0 ).width() - AGG::GetICN( buttonNoIcnID, 0 ).width(); |
There was a problem hiding this comment.
Please cache AGG::GetICN( buttonYesIcnID, 0 ) and AGG::GetICN( buttonNoIcnID, 0 ) calls as we have the same calls in the code below.
| case Dialog::YES | Dialog::NO: | ||
| offset.x = area.x; | ||
| case Dialog::YES | Dialog::NO: { | ||
| const int32_t horizontalFreeSpace = area.width - AGG::GetICN( buttonYesIcnID, 0 ).width() - AGG::GetICN( buttonNoIcnID, 0 ).width(); |
There was a problem hiding this comment.
Should we add an assertion that horizontalFreeSpace must be always be more than 0?
| const int32_t horizontalFreeSpace = area.width - AGG::GetICN( buttonOkayIcnID, 0 ).width() - AGG::GetICN( buttonCancelIcnID, 0 ).width(); | ||
| const int32_t padding = horizontalFreeSpace / 4; |
There was a problem hiding this comment.
The same comments as for line 429.
Relates to: #1355
The button layout has been changed for the button groups (YES/NO, OKAY/CANCEL)
The buttons are now closer to the center and some padding was added on each side.
Some layouts were not changed since they are already similar to the original game:
This one I'm not sure if we should update the position or not. It is already similar to the recruitment dialog so we might want to keep it as it.
