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

highlight the focused item in non report mode too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-26 16:33:19 +00:00
parent a95cdab85c
commit 0e980f9109
1 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/generic/listctrl.cpp
View File

@@ -417,10 +417,10 @@ private:
// get the mode (i.e. style) of the list control // get the mode (i.e. style) of the list control
inline int GetMode() const; inline int GetMode() const;
void SetAttributes(wxDC *dc, // prepare the DC for drawing with these item's attributes, return true if
// we need to draw the items background to highlight it, false otherwise
bool SetAttributes(wxDC *dc,
const wxListItemAttr *attr, const wxListItemAttr *attr,
const wxColour& colText,
const wxFont& font,
bool highlight); bool highlight);
// these are only used by GetImage/SetImage above, we don't support images // these are only used by GetImage/SetImage above, we don't support images
@@ -1518,32 +1518,68 @@ void wxListLineData::SetAttr(wxListItemAttr *attr)
item->SetAttr(attr); item->SetAttr(attr);
} }
void wxListLineData::SetAttributes(wxDC *dc, bool wxListLineData::SetAttributes(wxDC *dc,
const wxListItemAttr *attr, const wxListItemAttr *attr,
const wxColour& colText, bool highlighted)
const wxFont& font,
bool highlight)
{ {
// don't use foregroud colour for drawing highlighted items - this might wxWindow *listctrl = m_owner->GetParent();
// fg colour
// don't use foreground colour for drawing highlighted items - this might
// make them completely invisible (and there is no way to do bit // make them completely invisible (and there is no way to do bit
// arithmetics on wxColour, unfortunately) // arithmetics on wxColour, unfortunately)
if ( !highlight && attr && attr->HasTextColour() ) wxColour colText;
if ( highlighted )
{ {
dc->SetTextForeground(attr->GetTextColour()); colText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
} }
else else
{ {
dc->SetTextForeground(colText); if ( attr && attr->HasTextColour() )
{
colText = attr->GetTextColour();
}
else
{
colText = listctrl->GetForegroundColour();
}
} }
dc->SetTextForeground(colText);
// font
wxFont font;
if ( attr && attr->HasFont() ) if ( attr && attr->HasFont() )
{ {
dc->SetFont(attr->GetFont()); font = attr->GetFont();
} }
else else
{ {
dc->SetFont(font); font = listctrl->GetFont();
} }
dc->SetFont(font);
// bg colour
bool hasBgCol = attr && attr->HasBackgroundColour();
if ( highlighted || hasBgCol )
{
if ( highlighted )
{
dc->SetBrush( *m_owner->m_highlightBrush );
}
else
{
dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
}
dc->SetPen( *wxTRANSPARENT_PEN );
return TRUE;
}
return FALSE;
} }
void wxListLineData::Draw( wxDC *dc ) void wxListLineData::Draw( wxDC *dc )
@@ -1551,6 +1587,15 @@ void wxListLineData::Draw( wxDC *dc )
wxListItemDataList::Node *node = m_items.GetFirst(); wxListItemDataList::Node *node = m_items.GetFirst();
wxCHECK_RET( node, _T("no subitems at all??") ); wxCHECK_RET( node, _T("no subitems at all??") );
bool highlighted = IsHighlighted();
wxListItemAttr *attr = GetAttr();
if ( SetAttributes(dc, attr, highlighted) )
{
dc->DrawRectangle( m_gi->m_rectHighlight );
}
wxListItemData *item = node->GetData(); wxListItemData *item = node->GetData();
if (item->HasImage()) if (item->HasImage())
{ {
@@ -1575,43 +1620,12 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
if ( !IsVirtual() ) if ( !IsVirtual() )
highlighted = m_highlighted; highlighted = m_highlighted;
// default foreground colour
wxWindow *listctrl = m_owner->GetParent();
wxColour colText;
if ( highlighted )
{
colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
}
else
{
colText = listctrl->GetForegroundColour();
}
// default font
wxFont font = listctrl->GetFont();
// TODO: later we should support setting different attributes for // TODO: later we should support setting different attributes for
// different columns - to do it, just add "col" argument to // different columns - to do it, just add "col" argument to
// GetAttr() and move this code into the loop below // GetAttr() and move these lines into the loop below
wxListItemAttr *attr = GetAttr(); wxListItemAttr *attr = GetAttr();
SetAttributes(dc, attr, colText, font, highlighted); if ( SetAttributes(dc, attr, highlighted) )
bool hasBgCol = attr && attr->HasBackgroundColour();
if ( highlighted || hasBgCol )
{ {
if ( highlighted )
{
dc->SetBrush( *m_owner->m_highlightBrush );
}
else
{
if ( hasBgCol )
dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
else
dc->SetBrush( * wxWHITE_BRUSH );
}
dc->SetPen( * wxTRANSPARENT_PEN );
dc->DrawRectangle( rectHL ); dc->DrawRectangle( rectHL );
} }