Merge with "Beep6581/dev"

2023-03-11 11:02:29 +01:00
parent 0b67f1b7b4 ca08a279d5
commit c28d5aab97
252 changed files with 9021 additions and 3231 deletions
--- a/rtgui/thumbbrowserentrybase.cc
+++ b/rtgui/thumbbrowserentrybase.cc
@@ -120,7 +120,7 @@ Glib::ustring getPaddedName(const Glib::ustring& name)

 }

-ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname) :
+ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname, Thumbnail *thm) :
    fnlabw(0),
    fnlabh(0),
    dtlabw(0),
@@ -154,7 +154,8 @@ ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname) :
    bbPreview(nullptr),
    cursor_type(CSUndefined),
    collate_name(getPaddedName(dispname).casefold_collate_key()),
-    thumbnail(nullptr),
+    collate_exif(getPaddedName(thm->getExifString()).casefold_collate_key()),
+    thumbnail(thm),
    filename(fname),
    selected(false),
    drawable(false),