From 67e27ed7eacd0afbc822781c212b3f62d9a3b9fe Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Sun, 22 Oct 2017 20:09:28 +0000 Subject: [PATCH] Atlas: Cleanup horizontal alignment flags being ignored, fix warnings on a start. Fix #3824 Patch by: Clockwork-Muse. Reviewed by: vladislavbelov. Differential Revision: https://code.wildfiregames.com/D824 This was SVN commit r20327. --- .../atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp | 4 ++-- .../AtlasUI/ScenarioEditor/Sections/Player/Player.cpp | 4 ++-- .../AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp | 8 ++++---- .../atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp index fd0181aa6b..dbcee02dad 100644 --- a/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp +++ b/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2017 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -95,7 +95,7 @@ MapDialog::MapDialog(wxWindow* parent, MapDialogType type, const wxIcon& icon) wxSizer* filenameSizer = new wxBoxSizer(wxHORIZONTAL); filenameSizer->AddSpacer(10); - filenameSizer->Add(new wxStaticText(this, wxID_ANY, _("Map name: ")), wxSizerFlags().Align(wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL)); + filenameSizer->Add(new wxStaticText(this, wxID_ANY, _("Map name: ")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); wxTextCtrl* filename = new wxTextCtrl(this, ID_MapDialogFilename, wxEmptyString); if (m_Type == MAPDIALOG_OPEN) filename->Disable(); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp index 6409921e15..1b5c1ce384 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp @@ -201,7 +201,7 @@ public: wxChoice* teamCtrl = new wxChoice(this, wxID_ANY); boxSizer->Add(new DefaultCheckbox(this, ID_DefaultTeam, teamCtrl), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); boxSizer->AddSpacer(5); - boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Team")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT)); + boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Team")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); boxSizer->AddSpacer(5); teamCtrl->Append(_("None")); teamCtrl->Append(_T("1")); @@ -560,7 +560,7 @@ PlayerSettingsControl::PlayerSettingsControl(wxWindow* parent, ScenarioEditor& s SetSizer(sizer); wxBoxSizer* boxSizer = new wxBoxSizer(wxHORIZONTAL); - boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Num players")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT)); + boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Num players")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL)); wxSpinCtrl* numPlayersSpin = new wxSpinCtrl(this, ID_NumPlayers, wxEmptyString, wxDefaultPosition, wxSize(40, -1)); numPlayersSpin->SetValue(MAX_NUM_PLAYERS); numPlayersSpin->SetRange(1, MAX_NUM_PLAYERS); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp index 52166ab0dc..6a64717960 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp @@ -119,7 +119,7 @@ public: wxImage img(qry.preview->imageWidth, qry.preview->imageHeight, buf); wxStaticBitmap* bitmap = new wxStaticBitmap(this, wxID_ANY, wxBitmap(img), wxDefaultPosition, wxSize(qry.preview->imageWidth, qry.preview->imageHeight), wxBORDER_SIMPLE); - m_Sizer->Add(bitmap, wxSizerFlags(1).Align(wxALIGN_CENTRE)); + m_Sizer->Add(bitmap, wxSizerFlags(1).Align(wxALIGN_CENTER)); m_Sizer->Add(label, wxSizerFlags().Expand()); // We have to force the sidebar to layout manually @@ -238,11 +238,11 @@ TerrainSidebar::TerrainSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebar m_PassabilityChoice = new wxChoice(scrolledWindow, ID_Passability, wxDefaultPosition, wxDefaultSize, defaultChoices); m_PassabilityChoice->SetSelection(0); - visSizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Passability")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT)); + visSizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Passability")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT)); visSizer->Add(Tooltipped(m_PassabilityChoice, _("View passability classes")), wxSizerFlags().Expand()); - visSizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Priorities")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT)); + visSizer->Add(new wxStaticText(scrolledWindow, wxID_ANY, _("Priorities")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT)); visSizer->Add(Tooltipped(new wxCheckBox(scrolledWindow, ID_ShowPriorities, _("")), _("Show terrain texture priorities"))); } @@ -396,7 +396,7 @@ public: wxSizer* imageSizer = new wxBoxSizer(wxVERTICAL); imageSizer->Add(button, wxSizerFlags().Center()); imageSizer->Add(label, wxSizerFlags().Proportion(1).Center()); - m_ItemSizer->Add(imageSizer, wxSizerFlags().Expand().Center()); + m_ItemSizer->Add(imageSizer, wxSizerFlags().Expand()); } m_ScrolledPanel->Fit(); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp index 9501a762c8..6140cb8326 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp @@ -244,9 +244,9 @@ void Brush::CreateUI(wxWindow* parent, wxSizer* sizer) // TODO: These are yucky wxFlexGridSizer* spinnerSizer = new wxFlexGridSizer(2, 5, 5); spinnerSizer->AddGrowableCol(1); - spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Size")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT)); + spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Size")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT)); spinnerSizer->Add(new BrushSizeCtrl(parent, *this), wxSizerFlags().Expand()); - spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Strength")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT)); + spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Strength")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT)); spinnerSizer->Add(new BrushStrengthCtrl(parent, *this), wxSizerFlags().Expand()); sizer->Add(spinnerSizer, wxSizerFlags().Expand()); }