Take the hgap and vgap into account when doing alignments in grid

sizers.  The gap is not part of the "cell" so alignments should be
relative to the edge of the gap, not the next cell.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-13 19:12:06 +00:00
parent bf4ce9bd0e
commit 89a94520ea

View File

@@ -1053,20 +1053,20 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
{
if (flag & wxALIGN_CENTER_HORIZONTAL)
{
pt.x = x + (w - sz.x) / 2;
pt.x = x + (w - sz.x - m_hgap) / 2;
}
else if (flag & wxALIGN_RIGHT)
{
pt.x = x + (w - sz.x);
pt.x = x + (w - sz.x - m_hgap);
}
if (flag & wxALIGN_CENTER_VERTICAL)
{
pt.y = y + (h - sz.y) / 2;
pt.y = y + (h - sz.y - m_vgap) / 2;
}
else if (flag & wxALIGN_BOTTOM)
{
pt.y = y + (h - sz.y);
pt.y = y + (h - sz.y - m_vgap);
}
}