dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't nest Paths in Common settings

Browse source 
Doesn't make sense to have the Paths StaticBox inside the Common
settings StaticBox so make it a top-level item as well.

While at it dissolve nested constructors to make the creation of the
widgets more readable.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2026-07-29 19:24:06 +02:00
parent 91a37e32f6
commit 49c887b7ca
No known key found for this signature in database
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp
View file

@ -52,42 +52,44 @@ enum {
ID_DeletePath ID_DeletePath
}; };
// Helper function for adding tooltips
static wxWindow* Tooltipped(wxWindow* window, const wxString& tip)
{
window->SetToolTip(tip);
return window;
}
CinemaSidebar::CinemaSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer) CinemaSidebar::CinemaSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer)
: Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer) : Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer)
{ {
wxStaticBoxSizer* commonSizer = new wxStaticBoxSizer(wxVERTICAL, this, _T("Common settings")); {
m_MainSizer->Add(commonSizer, wxSizerFlags().Expand()); auto* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _T("Common settings"));
wxFlexGridSizer* gridSizer = new wxFlexGridSizer(1, 5, 5); m_DrawPath = new wxCheckBox(sizer->GetStaticBox(), ID_PathsDrawing, _("Draw all paths"));
gridSizer->AddGrowableCol(0); m_DrawPath->SetToolTip(_("Display every cinematic path added to the map"));
gridSizer->Add(Tooltipped(m_DrawPath = new wxCheckBox(commonSizer->GetStaticBox(), ID_PathsDrawing, _("Draw all paths")), sizer->Add(m_DrawPath, wxSizerFlags().Expand().Border(wxALL, Atlas::Style::STATICBOX_PADDING));
_("Display every cinematic path added to the map")));
commonSizer->Add(gridSizer, wxSizerFlags().Expand().Border(wxALL, Atlas::Style::STATICBOX_PADDING)); m_MainSizer->Add(sizer, wxSizerFlags().Expand());
}
// Paths list panel {
wxStaticBoxSizer* pathsBoxSizer = new wxStaticBoxSizer(wxVERTICAL, commonSizer->GetStaticBox(), _T("Paths")); auto* boxSizer = new wxStaticBoxSizer(wxVERTICAL, this, _T("Paths"));
wxStaticBox* pathsBox = pathsBoxSizer->GetStaticBox(); auto* box = boxSizer->GetStaticBox();
gridSizer->Add(pathsBoxSizer, wxSizerFlags().Proportion(1).Expand());
wxFlexGridSizer* pathsSizer = new wxFlexGridSizer(1, 5, 5); m_PathList = new wxListBox(box, ID_PathsList, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_SORT);
pathsSizer->AddGrowableCol(0);
pathsBoxSizer->Add(pathsSizer, wxSizerFlags().Expand().Border(wxALL, Atlas::Style::STATICBOX_PADDING));
pathsSizer->Add(m_PathList = new wxListBox(pathsBox, ID_PathsList, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_SORT), wxSizerFlags().Proportion(1).Expand()); auto* deleteButton = new wxButton(box, ID_DeletePath, _("Delete"));
commonSizer->AddSpacer(3); deleteButton->SetToolTip(_T("Delete selected path"));
pathsSizer->Add(Tooltipped(new wxButton(pathsBox, ID_DeletePath, _("Delete")), _T("Delete selected path")), wxSizerFlags().Expand());
pathsSizer->Add(m_NewPathName = new wxTextCtrl(pathsBox, wxID_ANY), wxSizerFlags().Expand()); m_NewPathName = new wxTextCtrl(box, wxID_ANY);
pathsSizer->Add(new wxButton(pathsBox, ID_AddPath, _("Add")), wxSizerFlags().Expand());
auto* addButton = new wxButton(box, ID_AddPath, _("Add"));
wxFlexGridSizer* pathsSizer = new wxFlexGridSizer(1, 5, 5);
pathsSizer->AddGrowableCol(0);
pathsSizer->Add(m_PathList, wxSizerFlags().Proportion(1).Expand());
pathsSizer->Add(deleteButton, wxSizerFlags().Expand());
pathsSizer->Add(m_NewPathName, wxSizerFlags().Expand());
pathsSizer->Add(addButton, wxSizerFlags().Expand());
boxSizer->Add(pathsSizer, wxSizerFlags().Expand().Border(wxALL, Atlas::Style::STATICBOX_PADDING));
m_MainSizer->Add(boxSizer, wxSizerFlags().Expand());
}
} }
void CinemaSidebar::OnFirstDisplay() void CinemaSidebar::OnFirstDisplay()