mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-20 21:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix negative content width GTK warnings in Atlas

Browse Source 
Interdependent content width in terrain selection panel results in GTK
throwing warnings. Don't expand the grid cell content.

Also wrap the grid to keep spacing consistent and not variable for the
terrain buttons.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2026-06-01 19:22:32 +02:00
parent 9388692a47
commit 8cb4f5e4a3
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
+8 -6
View File
@@ -353,8 +353,10 @@ public:
sizer->Add(m_ScrolledPanel, wxSizerFlags().Proportion(1).Expand());
SetSizer(sizer);
m_ItemSizer = new wxGridSizer(6, 4, 0);
m_ScrolledPanel->SetSizer(m_ItemSizer);
wxSizer* wrapSizer = new wxBoxSizer(wxHORIZONTAL);
m_ItemSizer = new wxGridSizer(6, 5, 5);
wrapSizer->Add(m_ItemSizer, wxSizerFlags().Border(wxALL, 5));
m_ScrolledPanel->SetSizer(wrapSizer);
}
void OnDisplay()
@@ -391,8 +393,8 @@ public:
wxStaticText* label = new wxStaticText(m_ScrolledPanel, wxID_ANY, FormatTextureName(textureName), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER);
label->Wrap(imageWidth);
wxImage image(imageWidth, imageHeight);
wxBitmapButton* button = new wxBitmapButton(m_ScrolledPanel, wxID_ANY, wxBitmap(image));
wxBitmap bitmap{imageWidth, imageHeight, 24};
wxBitmapButton* button = new wxBitmapButton(m_ScrolledPanel, wxID_ANY, bitmap);
// Store the texture name in the clientdata slot
button->SetClientObject(new wxStringClientData(textureName));
@@ -400,7 +402,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());
m_ItemSizer->Add(imageSizer);
m_PreviewButtons.emplace(textureName, PreviewButton{button, false});
}
@@ -501,7 +503,7 @@ public:
void OnSize(wxSizeEvent& evt)
{
int numCols = std::max(1, (int)(evt.GetSize().GetWidth() / (imageWidth + 16)));
int numCols = std::max(1, static_cast<int>((evt.GetSize().GetWidth() - 5) / (imageWidth + 25)));
m_ItemSizer->SetCols(numCols);
evt.Skip();
}