// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-/*
- FIXME for virtual list controls
-
- +1. clicking on the item with a mouse is awfully slow, what is going on?
- note that selecting with keyboard seems to be much faster
- => fixed HighlightAll() - iterating over 1000000 items *is* slow
-
- 2. background colour is wrong?
- */
-
/*
TODO for better virtual list control support:
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
// ----------------------------------------------------------------------------
// constants
bool SelectItem(size_t item, bool select = TRUE);
// select the range of items
- void SelectRange(size_t itemFrom, size_t itemTo, bool select = TRUE);
+ //
+ // return true and fill the itemsChanged array with the indices of items
+ // which have changed state if "few" of them did, otherwise return false
+ // (meaning that too many items changed state to bother counting them
+ // individually)
+ bool SelectRange(size_t itemFrom, size_t itemTo,
+ bool select = TRUE,
+ wxArrayInt *itemsChanged = NULL);
// return true if the given item is selected
bool IsSelected(size_t item) const;
{
public:
wxListItemData(wxListMainWindow *owner);
- ~wxListItemData() { delete m_attr; delete m_rect; }
+ ~wxListItemData();
void SetItem( const wxListItem &info );
void SetImage( int image ) { m_image = image; }
void GetItem( wxListItem &info ) const;
- wxListItemAttr *GetAttributes() const { return m_attr; }
+ void SetAttr(wxListItemAttr *attr) { m_attr = attr; }
+ wxListItemAttr *GetAttr() const { return m_attr; }
public:
// the item image or -1
wxString GetText(int index) const;
void SetText( int index, const wxString s );
+ wxListItemAttr *GetAttr() const;
+ void SetAttr(wxListItemAttr *attr);
+
// return true if the highlighting really changed
bool Highlight( bool on );
// get the mode (i.e. style) of the list control
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 wxColour& colText,
- const wxFont& font,
bool highlight);
// these are only used by GetImage/SetImage above, we don't support images
// return the hit code for the corresponding position (in this line)
long HitTestLine(size_t line, int x, int y) const;
+ // bring the selected item into view, scrolling to it if necessary
+ void MoveToItem(size_t item);
+
+ // bring the current item into view
+ void MoveToFocus() { MoveToItem(m_current); }
+
void EditLabel( long item );
void OnRenameTimer();
void OnRenameAccept();
void OnMouse( wxMouseEvent &event );
- void MoveToFocus();
// called to switch the selection from the current item to newCurrent,
void OnArrowChar( size_t newCurrent, const wxKeyEvent& event );
int GetSelectedItemCount();
// set the scrollbars and update the positions of the items
- void RecalculatePositions();
+ void RecalculatePositions(bool noRefresh = FALSE);
// refresh the window and the header
void RefreshAll();
// initialize the current item if needed
void UpdateCurrent();
+ // delete all items but don't refresh: called from dtor
+ void DoDeleteAllItems();
+
// called when an item is [un]focuded, i.e. becomes [not] current
//
// currently unused
return FALSE;
}
-void wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo, bool select)
+bool wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo,
+ bool select,
+ wxArrayInt *itemsChanged)
{
+ // 100 is hardcoded but it shouldn't matter much: the important thing is
+ // that we don't refresh everything when really few (e.g. 1 or 2) items
+ // change state
+ static const size_t MANY_ITEMS = 100;
+
wxASSERT_MSG( itemFrom <= itemTo, _T("should be in order") );
// are we going to have more [un]selected items than the other ones?
- if ( itemTo - itemFrom > m_count / 2 )
+ if ( itemTo - itemFrom > m_count/2 )
{
if ( select != m_defaultState )
{
if ( selOld.Index(item) == wxNOT_FOUND )
m_itemsSel.Add(item);
}
+
+ // many items (> half) changed state
+ itemsChanged = NULL;
}
else // select == m_defaultState
{
// delete all of them (from end to avoid changing indices)
for ( int i = end; i >= (int)start; i-- )
{
+ if ( itemsChanged )
+ {
+ if ( itemsChanged->GetCount() > MANY_ITEMS )
+ {
+ // stop counting (see comment below)
+ itemsChanged = NULL;
+ }
+
+ itemsChanged->Add(m_itemsSel[i]);
+ }
+
m_itemsSel.RemoveAt(i);
}
}
}
else // "few" items change state
{
+ if ( itemsChanged )
+ {
+ itemsChanged->Empty();
+ }
+
// just add the items to the selection
for ( size_t item = itemFrom; item <= itemTo; item++ )
{
- SelectItem(item, select);
+ if ( SelectItem(item, select) && itemsChanged )
+ {
+ itemsChanged->Add(item);
+
+ if ( itemsChanged->GetCount() > MANY_ITEMS )
+ {
+ // stop counting them, we'll just eat gobs of memory
+ // for nothing at all - faster to refresh everything in
+ // this case
+ itemsChanged = NULL;
+ }
+ }
}
}
+
+ // we set it to NULL if there are many items changing state
+ return itemsChanged != NULL;
}
void wxSelectionStore::OnItemDelete(size_t item)
// wxListItemData
//-----------------------------------------------------------------------------
+wxListItemData::~wxListItemData()
+{
+ // in the virtual list control the attributes are managed by the main
+ // program, so don't delete them
+ if ( !m_owner->IsVirtual() )
+ {
+ delete m_attr;
+ }
+
+ delete m_rect;
+}
+
void wxListItemData::Init()
{
m_image = -1;
m_owner = owner;
- if ( owner->HasFlag(wxLC_REPORT) )
+ if ( owner->InReportView() )
{
m_rect = NULL;
}
return item->GetImage();
}
-void wxListLineData::SetAttributes(wxDC *dc,
+wxListItemAttr *wxListLineData::GetAttr() const
+{
+ wxListItemDataList::Node *node = m_items.GetFirst();
+ wxCHECK_MSG( node, NULL, _T("invalid column index in GetAttr()") );
+
+ wxListItemData *item = node->GetData();
+ return item->GetAttr();
+}
+
+void wxListLineData::SetAttr(wxListItemAttr *attr)
+{
+ wxListItemDataList::Node *node = m_items.GetFirst();
+ wxCHECK_RET( node, _T("invalid column index in SetAttr()") );
+
+ wxListItemData *item = node->GetData();
+ item->SetAttr(attr);
+}
+
+bool wxListLineData::SetAttributes(wxDC *dc,
const wxListItemAttr *attr,
- const wxColour& colText,
- const wxFont& font,
- bool highlight)
+ bool highlighted)
{
- // 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
// arithmetics on wxColour, unfortunately)
- if ( !highlight && attr && attr->HasTextColour() )
+ wxColour colText;
+ if ( highlighted )
{
- dc->SetTextForeground(attr->GetTextColour());
+ colText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
}
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() )
{
- dc->SetFont(attr->GetFont());
+ font = attr->GetFont();
}
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 )
wxListItemDataList::Node *node = m_items.GetFirst();
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();
if (item->HasImage())
{
if ( !IsVirtual() )
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();
-
- // VZ: currently we set the colours/fonts only once, but like this (i.e.
- // using SetAttributes() inside the loop), it will be trivial to
- // customize the subitems (in report mode) too.
- wxListItemData *item = m_items.GetFirst()->GetData();
- wxListItemAttr *attr = item->GetAttributes();
- SetAttributes(dc, attr, colText, font, highlighted);
-
- bool hasBgCol = attr && attr->HasBackgroundColour();
- if ( highlighted || hasBgCol )
+ // TODO: later we should support setting different attributes for
+ // different columns - to do it, just add "col" argument to
+ // GetAttr() and move these lines into the loop below
+ wxListItemAttr *attr = GetAttr();
+ if ( SetAttributes(dc, attr, highlighted) )
{
- 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 );
}
wxListMainWindow::~wxListMainWindow()
{
- DeleteEverything();
+ DoDeleteAllItems();
delete m_highlightBrush;
}
ld->SetImage(listctrl->OnGetItemImage(line));
+ ld->SetAttr(listctrl->OnGetItemAttr(line));
}
wxListLineData *wxListMainWindow::GetDummyLine() const
}
}
-void wxListMainWindow::HighlightLines( size_t lineFrom, size_t lineTo, bool highlight )
+void wxListMainWindow::HighlightLines( size_t lineFrom,
+ size_t lineTo,
+ bool highlight )
{
if ( IsVirtual() )
{
- m_selStore.SelectRange(lineFrom, lineTo, highlight);
- RefreshLines(lineFrom, lineTo);
+ wxArrayInt linesChanged;
+ if ( !m_selStore.SelectRange(lineFrom, lineTo, highlight,
+ &linesChanged) )
+ {
+ // meny items changed state, refresh everything
+ RefreshLines(lineFrom, lineTo);
+ }
+ else // only a few items changed state, refresh only them
+ {
+ size_t count = linesChanged.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ RefreshLine(linesChanged[n]);
+ }
+ }
}
- else
+ else // iterate over all items in non report view
{
- // do it the dumb way
- bool needsRefresh = FALSE;
for ( size_t line = lineFrom; line <= lineTo; line++ )
{
if ( HighlightLine(line, highlight) )
- needsRefresh = TRUE;
+ {
+ RefreshLine(line);
+ }
}
-
- if ( needsRefresh )
- RefreshLines(lineFrom, lineTo);
}
}
rect.x = 0;
rect.y = GetLineY(lineFrom);
rect.width = GetClientSize().x;
- rect.height = GetLineY(lineTo) - rect.y;
+ rect.height = GetLineY(lineTo) - rect.y + GetLineHeight();
CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
RefreshRect( rect );
wxCoord xOrig, yOrig;
CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
+ // tell the caller cache to cache the data
+ if ( IsVirtual() )
+ {
+ wxListEvent evCache(wxEVT_COMMAND_LIST_CACHE_HINT,
+ GetParent()->GetId());
+ evCache.SetEventObject( GetParent() );
+ evCache.m_oldItemIndex = visibleFrom;
+ evCache.m_itemIndex = visibleTo;
+ GetParent()->GetEventHandler()->ProcessEvent( evCache );
+ }
+
for ( size_t line = visibleFrom; line <= visibleTo; line++ )
{
rectLine = GetLineRect(line);
if ( point != wxDefaultPosition )
le.m_pointDrag = point;
- GetLine(line)->GetItem( 0, le.m_item );
+ if ( command != wxEVT_COMMAND_LIST_DELETE_ITEM )
+ {
+ GetLine(line)->GetItem( 0, le.m_item );
+ }
+ //else: there may be no more such item
+
GetParent()->GetEventHandler()->ProcessEvent( le );
}
}
}
-void wxListMainWindow::MoveToFocus()
+void wxListMainWindow::MoveToItem(size_t item)
{
- if ( !HasCurrent() )
+ if ( item == (size_t)-1 )
return;
- wxRect rect = GetLineRect(m_current);
+ wxRect rect = GetLineRect(item);
int client_w, client_h;
GetClientSize( &client_w, &client_h );
wxCHECK_RET( id >= 0 && (size_t)id < GetItemCount(),
_T("invalid item index in SetItem") );
- if ( IsVirtual() )
+ if ( !IsVirtual() )
+ {
+ wxListLineData *line = GetLine((size_t)id);
+ line->SetItem( item.m_col, item );
+ }
+
+ if ( InReportView() )
{
// just refresh the line to show the new value of the text/image
RefreshLine((size_t)id);
}
- else // !virtual
+ else // !report
{
+ // refresh everything (resulting in horrible flicker - FIXME!)
m_dirty = TRUE;
-
- wxListLineData *line = GetLine((size_t)id);
- if ( HasFlag(wxLC_REPORT) )
- item.m_width = GetColumnWidth( item.m_col );
- line->SetItem( item.m_col, item );
}
}
m_selStore.SetItemCount(count);
m_countVirt = count;
- Refresh();
+ ResetVisibleLinesRange();
+
+ // scrollbars must be reset
+ m_dirty = TRUE;
}
int wxListMainWindow::GetSelectedItemCount()
// geometry calculation
// ----------------------------------------------------------------------------
-void wxListMainWindow::RecalculatePositions()
+void wxListMainWindow::RecalculatePositions(bool noRefresh)
{
- if ( IsEmpty() )
- return;
-
wxClientDC dc( this );
dc.SetFont( GetFont() );
SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
}
- // FIXME: why should we call it from here?
- UpdateCurrent();
+ if ( !noRefresh )
+ {
+ // FIXME: why should we call it from here?
+ UpdateCurrent();
- RefreshAll();
+ RefreshAll();
+ }
}
void wxListMainWindow::RefreshAll()
size_t index = (size_t)lindex;
- m_dirty = TRUE;
-
- // select the next item when the selected one is deleted
- if ( m_current == index )
+ // we don't need to adjust the index for the previous items
+ if ( HasCurrent() && m_current >= index )
{
- // the last valid index after deleting the item will be count-2
- if ( m_current == count - 1 )
+ // if the current item is being deleted, we want the next one to
+ // become selected - unless there is no next one - so don't adjust
+ // m_current in this case
+ if ( m_current != index || m_current == count - 1 )
{
m_current--;
}
}
- SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
-
if ( InReportView() )
{
ResetVisibleLinesRange();
}
m_dirty = TRUE;
+
+ SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
+
RefreshAfter(index);
}
m_columns.DeleteNode( node );
}
-void wxListMainWindow::DeleteAllItems()
+void wxListMainWindow::DoDeleteAllItems()
{
if ( IsEmpty() )
{
return;
}
- m_dirty = TRUE;
-
ResetCurrent();
// to make the deletion of all items faster, we don't send the
{
m_countVirt = 0;
- ResetVisibleLinesRange();
+ m_selStore.Clear();
}
if ( InReportView() )
}
m_lines.Clear();
+}
+
+void wxListMainWindow::DeleteAllItems()
+{
+ DoDeleteAllItems();
- m_selStore.Clear();
+ RecalculatePositions();
}
void wxListMainWindow::DeleteEverything()
_T("invalid index in EnsureVisible") );
// We have to call this here because the label in question might just have
- // been added and no screen update taken place.
- if (m_dirty)
- wxSafeYield();
+ // been added and its position is not known yet
+ if ( m_dirty )
+ {
+ m_dirty = FALSE;
- size_t oldCurrent = m_current;
- m_current = (size_t)index;
- MoveToFocus();
- m_current = oldCurrent;
+ RecalculatePositions(TRUE /* no refresh */);
+ }
+
+ MoveToItem((size_t)index);
}
long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
// -------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
EVT_SIZE(wxListCtrl::OnSize)
{
m_mainWin->DeleteEverything();
- int width = 0;
- int height = 0;
- GetClientSize( &width, &height );
+ // has the header visibility changed?
+ bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER),
+ willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);
- if (flag & wxLC_REPORT)
+ if ( hasHeader != willHaveHeader )
{
- if (!HasFlag(wxLC_REPORT))
+ // toggle it
+ if ( hasHeader )
+ {
+ if ( m_headerWin )
+ {
+ // don't delete, just hide, as we can reuse it later
+ m_headerWin->Show(FALSE);
+ }
+ //else: nothing to do
+ }
+ else // must show header
{
if (!m_headerWin)
{
CreateHeaderWindow();
-
- if (HasFlag(wxLC_NO_HEADER))
- m_headerWin->Show( FALSE );
}
- else
+ else // already have it, just show
{
- if (flag & wxLC_NO_HEADER)
- m_headerWin->Show( FALSE );
- else
- m_headerWin->Show( TRUE );
+ m_headerWin->Show( TRUE );
}
}
- }
- else // !report
- {
- if ( m_mainWin->HasHeader() )
- {
- m_headerWin->Show( FALSE );
- }
+
+ ResizeReportView(willHaveHeader);
}
}
if ( !m_mainWin )
return;
+ ResizeReportView(m_mainWin->HasHeader());
+
+ m_mainWin->RecalculatePositions();
+}
+
+void wxListCtrl::ResizeReportView(bool showHeader)
+{
int cw, ch;
GetClientSize( &cw, &ch );
- if ( m_mainWin->HasHeader() )
+ if ( showHeader )
{
m_headerWin->SetSize( 0, 0, cw, HEADER_HEIGHT );
m_mainWin->SetSize( 0, HEADER_HEIGHT + 1, cw, ch - HEADER_HEIGHT - 1 );
{
m_mainWin->SetSize( 0, 0, cw, ch );
}
-
- m_mainWin->RecalculatePositions();
}
void wxListCtrl::OnIdle( wxIdleEvent & event )
return -1;
}
+wxListItemAttr *wxListCtrl::OnGetItemAttr(long item) const
+{
+ wxASSERT_MSG( item >= 0 && item < GetItemCount(),
+ _T("invalid item index in OnGetItemAttr()") );
+
+ // no attributes by default
+ return NULL;
+}
+
void wxListCtrl::SetItemCount(long count)
{
wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
m_mainWin->SetItemCount(count);
}
+void wxListCtrl::RefreshItem(long item)
+{
+ m_mainWin->RefreshLine(item);
+}
+
+void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
+{
+ m_mainWin->RefreshLines(itemFrom, itemTo);
+}
+
#endif // wxUSE_LISTCTRL
projects / wxWidgets.git / blobdiff