Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use default wxCheckBox size in wxGridCellBoolEditor

Browse Source 
Using wxRendererNative::GetCheckBoxSize() as the size of wxCheckBox just
doesn't work with GTK 3, as the control has additional padding between
its actual contents and the focus rectangle, which means that its actual
size must be greater than the size to be passed to DrawCheckBox() in
order to draw a checkbox of the same size.

However it isn't really necessary to resize wxCheckBox at all, it's
enough for DrawCheckBox() to produce a check mark of the same size as
that shown in a default-sized wxCheckBox and this does work in wxGTK.

So keep the default size of wxCheckBox to make everything work.

This means wxGetGridCheckBoxRect() is not useful any more, so replace it
with wxGetContentRect() which just positions a rectangle of the given
size inside another one (this should probably be moved somewhere else,
as it's more general than wxGrid).
This commit is contained in:
Vadim Zeitlin
2019-11-29 04:57:59 +01:00
parent eadee05729
commit abc8841f0b
4 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/generic/grid.cpp
View File

@@ -10332,57 +10332,55 @@ wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
return editor;
}
wxRect wxGetGridCheckBoxRect(wxWindow* win,
const wxRect& cellRect,
int hAlign,
int vAlign)
wxRect
wxGetContentRect(wxSize contentSize,
const wxRect& cellRect,
int hAlign,
int vAlign)
{
wxSize checkBoxSize =
wxRendererNative::Get().GetCheckBoxSize(win, wxCONTROL_CELL);
// Keep square aspect ratio for the checkbox, but ensure that it fits into
// the available space, even if it's smaller than the standard size.
const wxCoord minSize = wxMin(cellRect.width, cellRect.height);
if ( checkBoxSize.x >= minSize || checkBoxSize.y >= minSize )
if ( contentSize.x >= minSize || contentSize.y >= minSize )
{
// It must still have positive size, however.
const int fittingSize = wxMax(1, minSize - 2*GRID_CELL_CHECKBOX_MARGIN);
checkBoxSize.x =
checkBoxSize.y = fittingSize;
contentSize.x =
contentSize.y = fittingSize;
}
wxRect checkBoxRect(checkBoxSize);
wxRect contentRect(contentSize);
if ( hAlign & wxALIGN_CENTER_HORIZONTAL )
{
checkBoxRect = checkBoxRect.CentreIn(cellRect, wxHORIZONTAL);
contentRect = contentRect.CentreIn(cellRect, wxHORIZONTAL);
}
else if ( hAlign & wxALIGN_RIGHT )
{
checkBoxRect.SetX(cellRect.x + cellRect.width
- checkBoxSize.x - GRID_CELL_CHECKBOX_MARGIN);
contentRect.SetX(cellRect.x + cellRect.width
- contentSize.x - GRID_CELL_CHECKBOX_MARGIN);
}
else // ( hAlign == wxALIGN_LEFT ) and invalid alignment value
{
checkBoxRect.SetX(cellRect.x + GRID_CELL_CHECKBOX_MARGIN);
contentRect.SetX(cellRect.x + GRID_CELL_CHECKBOX_MARGIN);
}
if ( vAlign & wxALIGN_CENTER_VERTICAL )
{
checkBoxRect = checkBoxRect.CentreIn(cellRect, wxVERTICAL);
contentRect = contentRect.CentreIn(cellRect, wxVERTICAL);
}
else if ( vAlign & wxALIGN_BOTTOM )
{
checkBoxRect.SetY(cellRect.y + cellRect.height
- checkBoxRect.y - GRID_CELL_CHECKBOX_MARGIN);
contentRect.SetY(cellRect.y + cellRect.height
- contentRect.y - GRID_CELL_CHECKBOX_MARGIN);
}
else // wxALIGN_TOP
{
checkBoxRect.SetY(cellRect.y + GRID_CELL_CHECKBOX_MARGIN);
contentRect.SetY(cellRect.y + GRID_CELL_CHECKBOX_MARGIN);
}
return checkBoxRect;
return contentRect;
}
#endif // wxUSE_GRID