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

Applied patch [ 829072 ] Splitter rendering fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-12-11 10:24:02 +00:00
parent bb56b0a828
commit 4666bb5f2e
1 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/generic/renderg.cpp
View File

@@ -241,16 +241,17 @@ wxRendererGeneric::GetSplitterParams(const wxWindow *win)
wxCoord sashWidth, wxCoord sashWidth,
border; border;
if ( win->HasFlag(wxSP_3D) ) if ( win->HasFlag(wxSP_3DSASH) )
{
sashWidth = 7; sashWidth = 7;
border = 2; else if ( win->HasFlag(wxSP_NOSASH) )
} sashWidth = 0;
else // no 3D effect else // no 3D effect
{
sashWidth = 3; sashWidth = 3;
if ( win->HasFlag(wxSP_3DBORDER) )
border = 2;
else // no 3D effect
border = 0; border = 0;
}
return wxSplitterRenderParams(sashWidth, border, false); return wxSplitterRenderParams(sashWidth, border, false);
} }
@@ -261,7 +262,7 @@ wxRendererGeneric::DrawSplitterBorder(wxWindow *win,
const wxRect& rectOrig, const wxRect& rectOrig,
int WXUNUSED(falgs)) int WXUNUSED(falgs))
{ {
if ( win->HasFlag(wxSP_3D) ) if ( win->HasFlag(wxSP_3DBORDER) )
{ {
wxRect rect = rectOrig; wxRect rect = rectOrig;
DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight); DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
@@ -304,34 +305,36 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
const wxCoord h = size.y; const wxCoord h = size.y;
wxCoord offset = 0; wxCoord offset = 0;
// If we're not drawing the border, droppings will // If we're drawing the border, draw the sash 3d lines shorter
// be left unless we make the sash shorter if ( win->HasFlag(wxSP_3DBORDER) )
if ( !win->HasFlag(wxSP_3DBORDER) )
{ {
offset = 3; offset = 1;
}
// from left to right
if ( win->HasFlag(wxSP_3D) )
{
dc.SetPen(m_penLightGrey);
dc.DrawLine(position, 1 + offset, position, h - 1 - offset);
dc.SetPen(m_penHighlight);
dc.DrawLine(position + 1, offset, position + 1, h - offset);
} }
dc.SetPen(*wxTRANSPARENT_PEN); dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
dc.DrawRectangle(position + 2, offset, 3, h - 2*offset);
if ( win->HasFlag(wxSP_3DSASH) )
if ( win->HasFlag(wxSP_3D) )
{ {
// Draw the 3D sash
dc.DrawRectangle(position + 2, 0, 3, h);
dc.SetPen(m_penLightGrey);
dc.DrawLine(position, offset, position, h - offset);
dc.SetPen(m_penHighlight);
dc.DrawLine(position + 1, 0, position + 1, h);
dc.SetPen(m_penDarkGrey); dc.SetPen(m_penDarkGrey);
dc.DrawLine(position + 5, offset, position + 5, h - offset); dc.DrawLine(position + 5, 0, position + 5, h);
dc.SetPen(m_penBlack); dc.SetPen(m_penBlack);
dc.DrawLine(position + 6, offset, position + 6, h - 1 - offset); dc.DrawLine(position + 6, offset, position + 6, h - offset);
}
else
{
// Draw a flat sash
dc.DrawRectangle(position, 0, 3, h);
} }
} }