From 06ca2bdfcd1ad011666f3aa16e042aa42e0ec99e Mon Sep 17 00:00:00 2001
From: itsmattkc <olivevideoeditor@gmail.com>
Date: Mon, 24 Dec 2018 23:33:23 +1100
Subject: [PATCH] fixed reveal in project

---
 panels/project.cpp  | 12 ++++++------
 panels/project.h    |  2 +-
 ui/timelinewidget.h |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/panels/project.cpp b/panels/project.cpp
index 70346b558..39f595d63 100644
--- a/panels/project.cpp
+++ b/panels/project.cpp
@@ -726,23 +726,25 @@ Media* Project::get_selected_folder() {
     return NULL;
 }
 
-bool Project::reveal_media(void *media, QModelIndex parent) {
+bool Project::reveal_media(Media *media, QModelIndex parent) {
     for (int i=0;i<project_model.rowCount(parent);i++) {
         const QModelIndex& item = project_model.index(i, 0, parent);
         Media* m = project_model.getItem(item);
 
         if (m->get_type() == MEDIA_TYPE_FOLDER) {
 			if (reveal_media(media, item)) return true;
-        } else if (m->to_object() == media) {
+        } else if (m == media) {
 			// expand all folders leading to this media
-            QModelIndex hierarchy = item.parent();
+            QModelIndex sorted_index = sorter->mapFromSource(item);
+
+            QModelIndex hierarchy = sorted_index.parent();
             while (hierarchy.isValid()) {
                 tree_view->setExpanded(hierarchy, true);
                 hierarchy = hierarchy.parent();
 			}
 
             // select item
-            tree_view->selectionModel()->select(item, QItemSelectionModel::Select);
+            tree_view->selectionModel()->select(sorted_index, QItemSelectionModel::Select);
 
 			return true;
 		}
@@ -1075,11 +1077,9 @@ void Project::clear_recent_projects() {
 
 void Project::set_icon_view_size(int s) {
     icon_view->setIconSize(QSize(s, s));
-    //    icon_view->setGridSize(QSize(s, s));
 }
 
 void Project::set_up_dir_enabled() {
-    dout << icon_view->rootIndex().isValid();
     directory_up->setEnabled(icon_view->rootIndex().isValid());
 }
 
diff --git a/panels/project.h b/panels/project.h
index b1e223855..df36e5284 100644
--- a/panels/project.h
+++ b/panels/project.h
@@ -54,7 +54,7 @@ public:
     void process_file_list(QStringList& files, bool recursive = false, Media* replace = NULL, Media *parent = NULL);
     void replace_media(Media* item, QString filename);
     Media *get_selected_folder();
-    bool reveal_media(void* media, QModelIndex parent = QModelIndex());
+    bool reveal_media(Media *media, QModelIndex parent = QModelIndex());
     void add_recent_project(QString url);
 
     void new_project();
diff --git a/ui/timelinewidget.h b/ui/timelinewidget.h
index 2ba01cab4..20e4bfea9 100644
--- a/ui/timelinewidget.h
+++ b/ui/timelinewidget.h
@@ -19,6 +19,7 @@ class TimelineAction;
 class QScrollBar;
 class SetSelectionsCommand;
 class QPainter;
+class Media;
 
 bool same_sign(int a, int b);
 void draw_waveform(Clip* clip, FootageStream* ms, long media_length, QPainter* p, const QRect& clip_rect, int waveform_start, int waveform_limit, double zoom);
@@ -65,7 +66,7 @@ private:
 	// used for "right click ripple"
 	long rc_ripple_min;
 	long rc_ripple_max;
-	void* rc_reveal_media;
+    Media* rc_reveal_media;
 
     QTimer tooltip_timer;
     int tooltip_clip;