From ae19b6485a2078cb9e431089ce5f7680e1f3d265 Mon Sep 17 00:00:00 2001
From: Hombre57 <natureh.510@gmail.com>
Date: Sun, 20 Aug 2017 22:51:06 +0200
Subject: [PATCH] Adding separators between frames in ExifPanel (see #4008)

---
 rtgui/exifpanel.cc | 32 +++++++++++++++++++++++---------
 rtgui/exifpanel.h  |  3 +++
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc
index 1f5b7d999..133c3a9ed 100644
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -45,6 +45,11 @@ ExifPanel::ExifPanel () : idata(nullptr)
 
     exifTreeModel = Gtk::TreeStore::create(exifColumns);
     exifTree->set_model (exifTreeModel);
+    exifTree->set_grid_lines(Gtk::TREE_VIEW_GRID_LINES_NONE);
+    exifTree->set_row_separator_func(
+            [&](const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& row)
+            { return row->get_value (exifColumns.isSeparator); }
+    );
 
     delicon = RTImage::createFromFile ("gtk-close.png");
     keepicon = RTImage::createFromFile ("gtk-apply.png");
@@ -184,18 +189,12 @@ void ExifPanel::setImageData (const FramesMetaData* id)
     exifTreeModel->clear ();
 
     if (id) {
-        //bool first = true;
-        // HOMBRE: Should we only display the current frame's Exifs ?
         for (unsigned int frameNum = 0; frameNum < id->getFrameCount (); ++frameNum) {
             if ( id->getExifData (frameNum)) {
-                /*
-                if (!first) {
-                    Gtk::Separator *sep = Gtk::manage (new Gtk::Separator);
-                    sep->set_orientation(Gtk::ORIENTATION_HORIZONTAL);
-                    first = false;
-                }
-                */
                 //id->getExifData ()->printAll ();
+                if (frameNum > 0) {
+                    addSeparator();
+                }
                 addDirectory (id->getExifData (frameNum), exifTreeModel->children());
             }
         }
@@ -233,6 +232,21 @@ Gtk::TreeModel::Children ExifPanel::addTag (const Gtk::TreeModel::Children& root
     return row.children();
 }
 
+Gtk::TreeModel::Children ExifPanel::addSeparator ()
+{
+
+    Gtk::TreeModel::Row row = *(exifTreeModel->append(exifTreeModel->children()));
+    row[exifColumns.action] = rtexif::ActionCode::AC_INVALID;
+    row[exifColumns.editable] = false;
+    row[exifColumns.edited] = false;
+    row[exifColumns.field_nopango] = "";
+    row[exifColumns.value_nopango] = "";
+    row[exifColumns.orig_value] = "";
+    row[exifColumns.isSeparator] = true;
+
+    return row.children();
+}
+
 void ExifPanel::addDirectory (const TagDirectory* dir, Gtk::TreeModel::Children root)
 {
 
diff --git a/rtgui/exifpanel.h b/rtgui/exifpanel.h
index db1fc8649..d86e82af8 100644
--- a/rtgui/exifpanel.h
+++ b/rtgui/exifpanel.h
@@ -43,6 +43,7 @@ private:
         Gtk::TreeModelColumn<rtexif::ActionCode> action;
         Gtk::TreeModelColumn<bool> editable;
         Gtk::TreeModelColumn<bool> edited;
+        Gtk::TreeModelColumn<bool> isSeparator;
 
         ExifColumns()
         {
@@ -55,6 +56,7 @@ private:
             add(value_nopango);
             add(editable);
             add(orig_value);
+            add(isSeparator);
         }
     };
     Glib::RefPtr<Gdk::Pixbuf> delicon;
@@ -76,6 +78,7 @@ private:
     void editTag (Gtk::TreeModel::Children root, Glib::ustring name, Glib::ustring value);
     void updateChangeList (Gtk::TreeModel::Children root, std::string prefix);
     void addDirectory (const rtexif::TagDirectory* dir, Gtk::TreeModel::Children root);
+    Gtk::TreeModel::Children addSeparator ();
     Glib::ustring getSelection (bool onlyifeditable = false);
     Glib::ustring getSelectedValue ();
     void updateChangeList ();