Changeset 2914

Timestamp:

Aug 23, 2007, 7:21:42 PM (15 years ago)

Author:

charles

Message:

• fix the torrent list's flicker on periodic refresh by resorting only when it's needed

Location:

trunk/wx

Files:

• torrent-list.cc (modified) (2 diffs)
• torrent-list.h (modified) (1 diff)

trunk/wx/torrent-list.cc

@@ -19 +19 @@
  */
 
-#include <iostream>
 #include <wx/intl.h>
 #include <torrent-list.h>
@@ -535 +534 @@
 }
 
+bool
+TorrentListCtrl :: IsSorted( ) const
+{
+    bool is_sorted = true;
+    long prevItem=-1, curItem=-1;
+
+    uglyHack = const_cast<TorrentListCtrl*>(this);
+    while( is_sorted )
+    {
+        prevItem = curItem;
+        curItem = GetNextItem( curItem, wxLIST_NEXT_ALL, wxLIST_STATE_DONTCARE );
+        if ( curItem == -1 )
+            break;
+        if( prevItem>=0 && curItem>=0 )
+            if( Compare( prevItem, curItem, prevSortCol ) > 0 )
+                is_sorted = false;
+    }
+    uglyHack = 0;
+
+    return is_sorted;
+}
+
 void
 TorrentListCtrl :: Resort( )
 {
-    uglyHack = this;
-
     myConfig->Write( _T("torrent-sort-column"), columnKeys[abs(prevSortCol)] );
     myConfig->Write( _T("torrent-sort-is-descending"), prevSortCol < 0 );
 
-    SortItems( Compare, prevSortCol );
-
-    const int n = GetItemCount ();
-    str2int_t tmp;
-    for( int i=0; i<n; ++i ) {
-        int idx = GetItemData( i );
-        const tr_info_t* info = tr_torrentInfo( myTorrents[idx] );
-        tmp[info->hashString] = i;
-    }
-    myHashToItem.swap( tmp );
-    uglyHack = NULL;
+    if( !IsSorted ( ) )
+    {
+        uglyHack = this;
+        SortItems( Compare, prevSortCol );
+
+        const int n = GetItemCount ();
+        str2int_t tmp;
+        for( int i=0; i<n; ++i ) {
+            int idx = GetItemData( i );
+            const tr_info_t* info = tr_torrentInfo( myTorrents[idx] );
+            tmp[info->hashString] = i;
+        }
+        myHashToItem.swap( tmp );
+        uglyHack = NULL;
+    }
 }
 

trunk/wx/torrent-list.h

@@ -121 +121 @@
         void OnItemSelected( wxListEvent& );
         void OnItemDeselected( wxListEvent& );
-
+        bool IsSorted( ) const;
 
     private: