Atlas: Cleanup horizontal alignment flags (ignored)
ClosedPublic
Actions

Authored by Clockwork-Muse on Aug 22 2017, 12:18 AM.

Details

Reviewers

vladislavbelov

Commits

Summary

Atlas: Cleanup horizontal alignment flags being ignored.

Test Plan

Start Atlas with a debug build, built with wxWidgets 3.1 or later. Debug warnings about ignored flags no longer appear.

Repository

rP 0 A.D. Public Repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Good diff! I'll test it at the evening.

Asserts on starts are disappeared. But there are asserts on the Terrain tab (TerrainNotebook).

wxWidget 3.1.

This revision now requires changes to proceed.Aug 22 2017, 5:21 PM

Remove offending Center option.

(Previously I'd actually removed Expand, but that was one of the comments on the old review. Not sure how I missed that the error was back)

Few notes:

There is a conflict for the Terrain.cpp file.
Bump year for source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp, source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp
Please, use a command like svn diff --diff-cmd diff -x "-U 99999" > changes.patch to create a patch, to easier see the context of any place.

But after I fixed the conflict, I compiled it and it works.

This revision is now accepted and ready to land.Aug 29 2017, 12:51 PM

This revision was automatically updated to reflect the committed changes.