Merge with "Beep6581/dev"

rtgui/thumbbrowserbase.cc

@@ -1091,6 +1091,25 @@ bool ThumbBrowserBase::Internal::on_scroll_event (GdkEventScroll* event)
 }
 
 
+void ThumbBrowserBase::resort ()
+{
+    {
+        MYWRITERLOCK(l, entryRW);
+
+        std::sort(
+            fd.begin(),
+            fd.end(),
+            [](const ThumbBrowserEntryBase* a, const ThumbBrowserEntryBase* b)
+            {
+                bool lt = a->compare(*b, options.sortMethod);
+                return options.sortDescending ? !lt : lt;
+            }
+        );
+    }
+
+    redraw ();
+}
+
 void ThumbBrowserBase::redraw (ThumbBrowserEntryBase* entry)
 {
 
@@ -1218,9 +1237,30 @@ void ThumbBrowserBase::enableTabMode(bool enable)
     }
 }
 
-void ThumbBrowserBase::initEntry (ThumbBrowserEntryBase* entry)
+void ThumbBrowserBase::insertEntry (ThumbBrowserEntryBase* entry)
 {
-    entry->setOffset ((int)(hscroll.get_value()), (int)(vscroll.get_value()));
+    // find place in sort order
+    {
+        MYWRITERLOCK(l, entryRW);
+
+        fd.insert(
+            std::lower_bound(
+                fd.begin(),
+                fd.end(),
+                entry,
+                [](const ThumbBrowserEntryBase* a, const ThumbBrowserEntryBase* b)
+                {
+                    bool lt = a->compare(*b, options.sortMethod);
+                    return options.sortDescending ? !lt : lt;
+                }
+            ),
+            entry
+        );
+
+        entry->setOffset ((int)(hscroll.get_value()), (int)(vscroll.get_value()));
+    }
+
+    redraw ();
 }
 
 void ThumbBrowserBase::getScrollPosition (double& h, double& v)