/////////////////////////////////////////////////////////////////////////////
/*
- TODO for better virtual list control support:
+ TODO
- 1. less dumb line caching, we should cache at least all those visible
- in the control itself and probably twice as many (we might also need to
- cache the first one always for geometry calculations?)
-
- +2. storing selections: we can't use an array to store the selected indices
- like right now as selecting all in a control with 1000000 items is not
- doable like this - instead, store selections as collection of individual
- items and ranges
-
- => wxSelectionStore
-
- 3. we need to implement searching/sorting somehow
-
- 4. the idea of storing the line index in the line itself is really stupid,
- we shouldn't need it - but for this we have to get rid of all calles to
- wxListLineData::GetFoo() and replace them with something like
- if ( IsVirtual()
- ... we have it ourselves ...
- else
- line->GetFoo();
-
- => done
-
- 5. attributes support: we need OnGetItemAttr() as well!
+ 1. we need to implement searching/sorting for virtual controls somehow
+ 2. when changing selection the lines are refreshed twice
*/
// ============================================================================
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG)
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)
static const int WIDTH_COL_DEFAULT = 80;
static const int WIDTH_COL_MIN = 10;
+// the space between the image and the text in the report mode
+static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
+
// ============================================================================
// private classes
// ============================================================================
void RefreshLine( size_t line );
void RefreshLines( size_t lineFrom, size_t lineTo );
+ // refresh all selected items
+ void RefreshSelected();
+
// refresh all lines below the given one: the difference with
// RefreshLines() is that the index here might not be a valid one (happens
// when the last line is deleted)
// get the y position of the given line (only for report view)
wxCoord GetLineY(size_t line) const;
+ // get the brush to use for the item highlighting
+ wxBrush *GetHighlightBrush() const
+ {
+ return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
+ }
+
//protected:
// the array of all line objects for a non virtual list control
wxListLineDataArray m_lines;
// call
bool m_dirty;
- wxBrush *m_highlightBrush;
wxColour *m_highlightColour;
int m_xScroll,
m_yScroll;
size_t m_lineFrom,
m_lineTo;
+ // the brushes to use for item highlighting when we do/don't have focus
+ wxBrush *m_highlightBrush,
+ *m_highlightUnfocusedBrush;
+
DECLARE_DYNAMIC_CLASS(wxListMainWindow);
DECLARE_EVENT_TABLE()
};
{
if ( highlighted )
{
- dc->SetBrush( *m_owner->m_highlightBrush );
+ dc->SetBrush( *m_owner->GetHighlightBrush() );
}
else
{
if (item->HasText())
{
wxRect rectLabel = m_gi->m_rectLabel;
+
+ wxDCClipper clipper(*dc, rectLabel);
dc->DrawText( item->GetText(), rectLabel.x, rectLabel.y );
}
}
const wxRect& rectHL,
bool highlighted )
{
- // use our own flag if we maintain it
- if ( !IsVirtual() )
- highlighted = m_highlighted;
-
// 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
{
wxListItemData *item = node->GetData();
+ int width = m_owner->GetColumnWidth(col++);
int xOld = x;
+ x += width;
if ( item->HasImage() )
{
int ix, iy;
- m_owner->DrawImage( item->GetImage(), dc, x, y );
+ m_owner->DrawImage( item->GetImage(), dc, xOld, y );
m_owner->GetImageSize( item->GetImage(), ix, iy );
- x += ix + 5; // FIXME: what is "5"?
- }
- int width = m_owner->GetColumnWidth(col++);
+ ix += IMAGE_MARGIN_IN_REPORT_MODE;
- wxDCClipper clipper(*dc, x, y, width, rect.height);
+ xOld += ix;
+ width -= ix;
+ }
+
+ wxDCClipper clipper(*dc, xOld, y, width, rect.height);
if ( item->HasText() )
{
- dc->DrawText( item->GetText(), x, y );
+ dc->DrawText( item->GetText(), xOld, y );
}
- x = xOld + width;
-
node = node->GetNext();
}
}
dc.SetPen( *wxWHITE_PEN );
DoDrawRect( &dc, x, HEADER_OFFSET_Y, cw, h-2 );
- dc.SetClippingRegion( x, HEADER_OFFSET_Y, cw-5, h-4 );
- dc.DrawText( item.GetText(), x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
- dc.DestroyClippingRegion();
+ wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw-5, h-4 );
+
+ dc.DrawText( item.GetText(),
+ x + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
+
x += wCol;
if (xEnd > w+5)
m_minX = xpos;
}
- if (event.LeftDown())
+ if (event.LeftDown() || event.RightUp())
{
- if (hit_border)
+ if (hit_border && event.LeftDown())
{
m_isDragging = TRUE;
m_currentX = x;
DrawCurrent();
CaptureMouse();
}
- else
+ else // click on a column
{
wxWindow *parent = GetParent();
- wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, parent->GetId() );
+ wxListEvent le( event.LeftDown()
+ ? wxEVT_COMMAND_LIST_COL_CLICK
+ : wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
+ parent->GetId() );
le.SetEventObject( parent );
le.m_col = m_column;
parent->GetEventHandler()->ProcessEvent( le );
{
Init();
- m_highlightBrush = (wxBrush *) NULL;
+ m_highlightBrush =
+ m_highlightUnfocusedBrush = (wxBrush *) NULL;
m_xScroll =
m_yScroll = 0;
{
Init();
- m_highlightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
+ m_highlightBrush = new wxBrush
+ (
+ wxSystemSettings::GetSystemColour
+ (
+ wxSYS_COLOUR_HIGHLIGHT
+ ),
+ wxSOLID
+ );
+
+ m_highlightUnfocusedBrush = new wxBrush
+ (
+ wxSystemSettings::GetSystemColour
+ (
+ wxSYS_COLOUR_BTNSHADOW
+ ),
+ wxSOLID
+ );
+
wxSize sz = size;
sz.y = 25;
DoDeleteAllItems();
delete m_highlightBrush;
+ delete m_highlightUnfocusedBrush;
delete m_renameTimer;
}
long wxListMainWindow::HitTestLine(size_t line, int x, int y) const
{
+ wxASSERT_MSG( line < GetItemCount(), _T("invalid line in HitTestLine") );
+
wxListLineData *ld = GetLine(line);
if ( ld->HasImage() && GetLineIconRect(line).Inside(x, y) )
else // !virtual
{
wxListLineData *ld = GetLine(line);
- wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHighlighted") );
+ wxCHECK_MSG( ld, FALSE, _T("invalid index in HighlightLine") );
changed = ld->Highlight(highlight);
}
void wxListMainWindow::RefreshLine( size_t line )
{
+ if ( HasFlag(wxLC_REPORT) )
+ {
+ size_t visibleFrom, visibleTo;
+ GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+ if ( line < visibleFrom || line > visibleTo )
+ return;
+ }
+
wxRect rect = GetLineRect(line);
CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
}
}
+void wxListMainWindow::RefreshSelected()
+{
+ if ( IsEmpty() )
+ return;
+
+ size_t from, to;
+ if ( InReportView() )
+ {
+ GetVisibleLinesRange(&from, &to);
+ }
+ else // !virtual
+ {
+ from = 0;
+ to = GetItemCount() - 1;
+ }
+
+ if ( HasCurrent() && m_current >= from && m_current <= to )
+ {
+ RefreshLine(m_current);
+ }
+
+ for ( size_t line = from; line <= to; line++ )
+ {
+ // NB: the test works as expected even if m_current == -1
+ if ( line != m_current && IsHighlighted(line) )
+ {
+ RefreshLine(line);
+ }
+ }
+}
+
void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
// Note: a wxPaintDC must be constructed even if no drawing is
}
}
- if ( HasCurrent() && m_hasFocus )
+ if ( HasCurrent() )
{
+ // don't draw rect outline under Max if we already have the background
+ // color but under other platforms only draw it if we do: it is a bit
+ // silly to draw "focus rect" if we don't have focus!
#ifdef __WXMAC__
- // no rect outline, we already have the background color
-#else
- dc.SetPen( *wxBLACK_PEN );
- dc.SetBrush( *wxTRANSPARENT_BRUSH );
- dc.DrawRectangle( GetLineHighlightRect(m_current) );
-#endif
+ if ( !m_hasFocus )
+#else // !__WXMAC__
+ if ( m_hasFocus )
+#endif // __WXMAC__/!__WXMAC__
+ {
+ dc.SetPen( *wxBLACK_PEN );
+ dc.SetBrush( *wxTRANSPARENT_BRUSH );
+ dc.DrawRectangle( GetLineHighlightRect(m_current) );
+ }
}
dc.EndDrawing();
if ( point != wxDefaultPosition )
le.m_pointDrag = point;
- if ( command != wxEVT_COMMAND_LIST_DELETE_ITEM )
+ // don't try to get the line info for virtual list controls: the main
+ // program has it anyhow and if we did it would result in accessing all
+ // the lines, even those which are not visible now and this is precisely
+ // what we're trying to avoid
+ if ( !IsVirtual() && (command != wxEVT_COMMAND_LIST_DELETE_ITEM) )
{
GetLine(line)->GetItem( 0, le.m_item );
}
if (event.Dragging())
{
if (m_dragCount == 0)
- m_dragStart = wxPoint(x,y);
+ {
+ // we have to report the raw, physical coords as we want to be
+ // able to call HitTest(event.m_pointDrag) from the user code to
+ // get the item being dragged
+ m_dragStart = event.GetPosition();
+ }
m_dragCount++;
le.m_itemIndex = m_current;
GetLine(m_current)->GetItem( 0, le.m_item );
GetParent()->GetEventHandler()->ProcessEvent( le );
+
+ if ( IsHighlighted(m_current) )
+ {
+ // don't unselect the item in single selection mode
+ break;
+ }
+ //else: select it in ReverseHighlight() below if unselected
}
- else
- {
- ReverseHighlight(m_current);
- }
+
+ ReverseHighlight(m_current);
break;
case WXK_RETURN:
{
m_hasFocus = TRUE;
- if ( HasCurrent() )
- RefreshLine( m_current );
-
if (!GetParent())
return;
+ RefreshSelected();
+
#ifdef __WXGTK__
g_focusWindow = GetParent();
#endif
{
m_hasFocus = FALSE;
- if ( HasCurrent() )
- RefreshLine( m_current );
+ RefreshSelected();
}
void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
_T("SetColumnWidth() can only be called in report mode.") );
m_dirty = TRUE;
+ wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
+ if ( headerWin )
+ headerWin->m_dirty = TRUE;
wxListHeaderDataList::Node *node = m_columns.Item( col );
wxCHECK_RET( node, _T("no column?") );
_T("invalid list ctrl item index in SetItem") );
size_t oldCurrent = m_current;
- size_t item = (size_t)litem; // sdafe because of the check above
+ size_t item = (size_t)litem; // safe because of the check above
+ // do we need to change the focus?
if ( stateMask & wxLIST_STATE_FOCUSED )
{
if ( state & wxLIST_STATE_FOCUSED )
m_current = item;
OnFocusLine( m_current );
- if ( IsSingleSel() && (oldCurrent != (size_t)-1) )
+ if ( oldCurrent != (size_t)-1 )
{
- HighlightLine(oldCurrent, FALSE);
+ if ( IsSingleSel() )
+ {
+ HighlightLine(oldCurrent, FALSE);
+ }
+
RefreshLine(oldCurrent);
}
{
OnUnfocusLine( m_current );
m_current = (size_t)-1;
+
+ RefreshLine( oldCurrent );
}
}
}
+ // do we need to change the selection state?
if ( stateMask & wxLIST_STATE_SELECTED )
{
bool on = (state & wxLIST_STATE_SELECTED) != 0;
Refresh();
wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
- if ( headerWin )
+ if ( headerWin && headerWin->m_dirty )
{
headerWin->m_dirty = FALSE;
headerWin->Refresh();
m_lines.RemoveAt( index );
}
+ // we need to refresh the (vert) scrollbar as the number of items changed
m_dirty = TRUE;
SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
// been added and its position is not known yet
if ( m_dirty )
{
- m_dirty = FALSE;
-
RecalculatePositions(TRUE /* no refresh */);
}
{
CalcUnscrolledPosition( x, y, &x, &y );
+ size_t count = GetItemCount();
+
if ( HasFlag(wxLC_REPORT) )
{
size_t current = y / GetLineHeight();
- flags = HitTestLine(current, x, y);
- if ( flags )
- return current;
+ if ( current < count )
+ {
+ flags = HitTestLine(current, x, y);
+ if ( flags )
+ return current;
+ }
}
else // !report
{
// TODO: optimize it too! this is less simple than for report view but
// enumerating all items is still not a way to do it!!
- size_t count = GetItemCount();
for ( size_t current = 0; current < count; current++ )
{
flags = HitTestLine(current, x, y);
// -------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
EVT_SIZE(wxListCtrl::OnSize)
projects / wxWidgets.git / blobdiff