AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't draw the selected item background if we don't have the focus

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-08-06 19:12:13 +00:00
parent 42f96a884e
commit cdb3cffe0e
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/generic/treectlg.cpp
View File

@ -1490,12 +1490,12 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId,
{ {
if (!IsExpanded(parent)) if (!IsExpanded(parent))
Expand( parent ); Expand( parent );
parent = GetParent( parent ); parent = GetParent( parent );
} }
EnsureVisible( itemId ); EnsureVisible( itemId );
// ctrl press // ctrl press
if (unselect_others) if (unselect_others)
{ {
@ -1787,8 +1787,11 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
int total_h = GetLineHeight(item); int total_h = GetLineHeight(item);
if (item->IsSelected()) bool paintBg = item->IsSelected() && m_hasFocus;
if ( paintBg )
{
dc.SetBrush(*m_hilightBrush); dc.SetBrush(*m_hilightBrush);
}
else else
{ {
wxColour colBg; wxColour colBg;
@ -1799,21 +1802,20 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
dc.SetBrush(wxBrush(colBg, wxSOLID)); dc.SetBrush(wxBrush(colBg, wxSOLID));
} }
int offset = 0; int offset = HasFlag(wxTR_ROW_LINES) ? 1 : 0;
if (HasFlag(wxTR_ROW_LINES)) offset = 1;
if (item->IsSelected() && image != NO_IMAGE) if ( paintBg && image != NO_IMAGE)
{ {
// If it's selected, and there's an image, then we should // If it's selected, and there's an image, then we should
// take care to leave the area under the image painted in the // take care to leave the area under the image painted in the
// background colour. // background colour.
dc.DrawRectangle( item->GetX() + image_w - 2, item->GetY()+offset, dc.DrawRectangle( item->GetX() + image_w - 2, item->GetY()+offset,
item->GetWidth() - image_w + 2, total_h-offset ); item->GetWidth() - image_w + 2, total_h-offset );
} }
else else
{ {
dc.DrawRectangle( item->GetX()-2, item->GetY()+offset, dc.DrawRectangle( item->GetX()-2, item->GetY()+offset,
item->GetWidth()+2, total_h-offset ); item->GetWidth()+2, total_h-offset );
} }
if ( image != NO_IMAGE ) if ( image != NO_IMAGE )
@ -1860,16 +1862,16 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
int endX = x-5; int endX = x-5;
if (!item->HasChildren()) endX += 20; if (!item->HasChildren()) endX += 20;
if (HasFlag( wxTR_MAC_BUTTONS )) if (HasFlag( wxTR_MAC_BUTTONS ))
{ {
if (item->HasPlus()) if (item->HasPlus())
{ {
dc.SetPen( *wxBLACK_PEN ); dc.SetPen( *wxBLACK_PEN );
dc.SetBrush( *m_hilightBrush ); dc.SetBrush( *m_hilightBrush );
wxPoint button[3]; wxPoint button[3];
if (item->IsExpanded()) if (item->IsExpanded())
{ {
button[0].x = x-5; button[0].x = x-5;
@ -1889,7 +1891,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
button[2].x = x+3; button[2].x = x+3;
} }
dc.DrawPolygon( 3, button ); dc.DrawPolygon( 3, button );
dc.SetPen( m_dottedPen ); dc.SetPen( m_dottedPen );
} }
} }
@ -1919,16 +1921,18 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
if ( item->IsSelected() ) if ( item->IsSelected() )
{ {
colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ); pen = wxBLACK_PEN;
if ( m_hasFocus )
{
colText = wxSystemSettings::
GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
}
#ifdef __WXMAC__ #ifdef __WXMAC__
// no rect outline, we already have the background color // no rect outline, we already have the background color
pen = wxTRANSPARENT_PEN; pen = wxTRANSPARENT_PEN;
#else
if ( m_hasFocus )
pen = wxBLACK_PEN;
#endif #endif
} }
else else
{ {
@ -1948,11 +1952,11 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
if (HasFlag( wxTR_ROW_LINES )) if (HasFlag( wxTR_ROW_LINES ))
{ {
dc.SetPen( *wxWHITE_PEN ); dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( 0, oldY, 10000, oldY ); dc.DrawLine( 0, oldY, 10000, oldY );
dc.DrawLine( 0, oldY + GetLineHeight(item), 10000, oldY + GetLineHeight(item) ); dc.DrawLine( 0, oldY + GetLineHeight(item), 10000, oldY + GetLineHeight(item) );
} }
// restore DC objects // restore DC objects
dc.SetBrush( *wxWHITE_BRUSH ); dc.SetBrush( *wxWHITE_BRUSH );
dc.SetPen( m_dottedPen ); dc.SetPen( m_dottedPen );
@ -2075,14 +2079,16 @@ void wxGenericTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
{ {
m_hasFocus = TRUE; m_hasFocus = TRUE;
if (m_current) RefreshLine( m_current ); if (m_current)
RefreshLine( m_current );
} }
void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
{ {
m_hasFocus = FALSE; m_hasFocus = FALSE;
if (m_current) RefreshLine( m_current ); if (m_current)
RefreshLine( m_current );
} }
void wxGenericTreeCtrl::OnChar( wxKeyEvent &event ) void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )