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

Don't draw outer border in wxGrid subwindows if wxGrid has one

Browse Source 
Combination of multiple borders looks bad, so skip drawing the left/top
borders in wxGrid{Row,Col,Corner}LabelWindow if wxGrid already has a
border around it.
This commit is contained in:
Vadim Zeitlin
2019-06-09 13:46:10 +02:00
parent d7fed302a3
commit d584420059
1 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/generic/grid.cpp
View File

@@ -261,49 +261,68 @@ void wxGridHeaderLabelsRenderer::DrawLabel(const wxGrid& grid,
} }
void wxGridRowHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid), void wxGridRowHeaderRendererDefault::DrawBorder(const wxGrid& grid,
wxDC& dc, wxDC& dc,
wxRect& rect) const wxRect& rect) const
{ {
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW))); dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
dc.DrawLine(rect.GetRight(), rect.GetTop(), dc.DrawLine(rect.GetRight(), rect.GetTop(),
rect.GetRight(), rect.GetBottom()); rect.GetRight(), rect.GetBottom());
dc.DrawLine(rect.GetLeft(), rect.GetTop(),
rect.GetLeft(), rect.GetBottom());
dc.DrawLine(rect.GetLeft(), rect.GetBottom(), dc.DrawLine(rect.GetLeft(), rect.GetBottom(),
rect.GetRight() + 1, rect.GetBottom()); rect.GetRight() + 1, rect.GetBottom());
// Only draw the external borders when the containing control doesn't have
// any border, otherwise they would compound with the outer border which
// looks bad.
int ofs = 0;
if ( grid.GetBorder() == wxBORDER_NONE )
{
dc.DrawLine(rect.GetLeft(), rect.GetTop(),
rect.GetLeft(), rect.GetBottom());
ofs = 1;
}
dc.SetPen(*wxWHITE_PEN); dc.SetPen(*wxWHITE_PEN);
dc.DrawLine(rect.GetLeft() + 1, rect.GetTop(), dc.DrawLine(rect.GetLeft() + ofs, rect.GetTop(),
rect.GetLeft() + 1, rect.GetBottom()); rect.GetLeft() + ofs, rect.GetBottom());
dc.DrawLine(rect.GetLeft() + 1, rect.GetTop(), dc.DrawLine(rect.GetLeft() + ofs, rect.GetTop(),
rect.GetRight(), rect.GetTop()); rect.GetRight(), rect.GetTop());
rect.Deflate(2); rect.Deflate(1 + ofs);
} }
void wxGridColumnHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid), void wxGridColumnHeaderRendererDefault::DrawBorder(const wxGrid& grid,
wxDC& dc, wxDC& dc,
wxRect& rect) const wxRect& rect) const
{ {
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW))); dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
dc.DrawLine(rect.GetRight(), rect.GetTop(), dc.DrawLine(rect.GetRight(), rect.GetTop(),
rect.GetRight(), rect.GetBottom()); rect.GetRight(), rect.GetBottom());
dc.DrawLine(rect.GetLeft(), rect.GetTop(),
rect.GetRight(), rect.GetTop());
dc.DrawLine(rect.GetLeft(), rect.GetBottom(), dc.DrawLine(rect.GetLeft(), rect.GetBottom(),
rect.GetRight() + 1, rect.GetBottom()); rect.GetRight() + 1, rect.GetBottom());
dc.SetPen(*wxWHITE_PEN); // As above, don't draw the outer border if the control has its own one.
dc.DrawLine(rect.GetLeft(), rect.GetTop() + 1, int ofs = 0;
rect.GetLeft(), rect.GetBottom()); if ( grid.GetBorder() == wxBORDER_NONE )
dc.DrawLine(rect.GetLeft(), rect.GetTop() + 1, {
rect.GetRight(), rect.GetTop() + 1); dc.DrawLine(rect.GetLeft(), rect.GetTop(),
rect.GetRight(), rect.GetTop());
rect.Deflate(2); ofs = 1;
}
dc.SetPen(*wxWHITE_PEN);
dc.DrawLine(rect.GetLeft(), rect.GetTop() + ofs,
rect.GetLeft(), rect.GetBottom());
dc.DrawLine(rect.GetLeft(), rect.GetTop() + ofs,
rect.GetRight(), rect.GetTop() + ofs);
rect.Deflate(1 + ofs);
} }
void wxGridCornerHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid), void wxGridCornerHeaderRendererDefault::DrawBorder(const wxGrid& grid,
wxDC& dc, wxDC& dc,
wxRect& rect) const wxRect& rect) const
{ {
@@ -312,18 +331,27 @@ void wxGridCornerHeaderRendererDefault::DrawBorder(const wxGrid& WXUNUSED(grid),
rect.GetRight() - 1, rect.GetTop()); rect.GetRight() - 1, rect.GetTop());
dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1, dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1,
rect.GetLeft(), rect.GetBottom() - 1); rect.GetLeft(), rect.GetBottom() - 1);
dc.DrawLine(rect.GetLeft(), rect.GetTop(),
rect.GetRight(), rect.GetTop()); // As above, don't draw either of outer border if there is already a border
dc.DrawLine(rect.GetLeft(), rect.GetTop(), // around the entire window.
rect.GetLeft(), rect.GetBottom()); int ofs = 0;
if ( grid.GetBorder() == wxBORDER_NONE )
{
dc.DrawLine(rect.GetLeft(), rect.GetTop(),
rect.GetRight(), rect.GetTop());
dc.DrawLine(rect.GetLeft(), rect.GetTop(),
rect.GetLeft(), rect.GetBottom());
ofs = 1;
}
dc.SetPen(*wxWHITE_PEN); dc.SetPen(*wxWHITE_PEN);
dc.DrawLine(rect.GetLeft() + 1, rect.GetTop() + 1, dc.DrawLine(rect.GetLeft() + 1, rect.GetTop() + ofs,
rect.GetRight() - 1, rect.GetTop() + 1); rect.GetRight() - 1, rect.GetTop() + ofs);
dc.DrawLine(rect.GetLeft() + 1, rect.GetTop() + 1, dc.DrawLine(rect.GetLeft() + ofs, rect.GetTop() + ofs,
rect.GetLeft() + 1, rect.GetBottom() - 1); rect.GetLeft() + ofs, rect.GetBottom() - 1);
rect.Deflate(2); rect.Deflate(1 + ofs);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------