X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc7343106df962079f7b8eaaefbc0514428d3f2a..057b55b016d9e2076fde422f29948dc55e97f0d7:/src/generic/listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index a306732993..d2f3b99675 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -41,6 +41,10 @@
             ... we have it ourselves ...
         else
             line->GetFoo();
+
+   => done
+
+   5. attributes support: we need OnGetItemAttr() as well!
  */
 
 // ============================================================================
@@ -54,7 +58,7 @@
 #ifdef __GNUG__
     #pragma implementation "listctrl.h"
     #pragma implementation "listctrlbase.h"
-#endif                                                  
+#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -243,7 +247,8 @@ public:
 
     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
@@ -380,6 +385,9 @@ public:
     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 );
 
@@ -1471,6 +1479,24 @@ int wxListLineData::GetImage( int index ) const
     return item->GetImage();
 }
 
+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);
+}
+
 void wxListLineData::SetAttributes(wxDC *dc,
                                    const wxListItemAttr *attr,
                                    const wxColour& colText,
@@ -1543,11 +1569,10 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
     // 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();
+    // TODO: later we should support setting different attributes for
+    //       different columns - to do it, just add "col" argument to
+    //       GetAttr() and move this code into the loop below
+    wxListItemAttr *attr = GetAttr();
     SetAttributes(dc, attr, colText, font, highlighted);
 
     bool hasBgCol = attr && attr->HasBackgroundColour();
@@ -2141,6 +2166,7 @@ void wxListMainWindow::CacheLineData(size_t line)
     }
 
     ld->SetImage(listctrl->OnGetItemImage(line));
+    ld->SetAttr(listctrl->OnGetItemAttr(line));
 }
 
 wxListLineData *wxListMainWindow::GetDummyLine() const
@@ -2397,7 +2423,6 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom )
 
         CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
         RefreshRect( rect );
-    
     }
     else // !report
     {
@@ -2418,6 +2443,12 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         return;
     }
 
+    if ( m_dirty )
+    {
+        // delay the repainting until we calculate all the items positions
+        return;
+    }
+
     PrepareDC( dc );
 
     int dev_x, dev_y;
@@ -2433,10 +2464,24 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
+
+        wxRect rectLine;
+        wxCoord xOrig, yOrig;
+        CalcUnscrolledPosition(0, 0, &xOrig, &yOrig);
+
         for ( size_t line = visibleFrom; line <= visibleTo; line++ )
         {
+            rectLine = GetLineRect(line);
+
+            if ( !IsExposed(rectLine.x - xOrig, rectLine.y - yOrig,
+                            rectLine.width, rectLine.height) )
+            {
+                // don't redraw unaffected lines to avoid flicker
+                continue;
+            }
+
             GetLine(line)->DrawInReportMode( &dc,
-                                             GetLineRect(line),
+                                             rectLine,
                                              GetLineHighlightRect(line),
                                              IsHighlighted(line) );
         }
@@ -2665,9 +2710,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     {
         // TODO: optimize it too! this is less simple than for report view but
         //       enumerating all items is still not a way to do it!!
-        for ( current = 0; current < count && !hitResult; current++ )
+        for ( current = 0; current < count; current++ )
         {
             hitResult = HitTestLine(current, x, y);
+            if ( hitResult )
+                break;
         }
     }
 
@@ -3340,19 +3387,21 @@ void wxListMainWindow::SetItem( wxListItem &item )
     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 );
     }
 }
 
@@ -3754,6 +3803,7 @@ void wxListMainWindow::DeleteItem( long lindex )
         m_lines.RemoveAt( index );
     }
 
+    m_dirty = TRUE;
     RefreshAfter(index);
 }
 
@@ -3932,6 +3982,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
     m_lines.Insert( line, id );
 
+    m_dirty = TRUE;
     RefreshLines(id, GetItemCount() - 1);
 }
 
@@ -4853,6 +4904,15 @@ int wxListCtrl::OnGetItemImage(long item) const
     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") );
@@ -4860,4 +4920,14 @@ void wxListCtrl::SetItemCount(long count)
     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