From e7eda529f89b252e1d6808b312743cb504c08237 Mon Sep 17 00:00:00 2001
From: Philippe Renon <philippe_renon@yahoo.fr>
Date: Wed, 12 Oct 2016 22:00:56 +0200
Subject: [PATCH] LP-434 uavobjectbrowser: expand less when filtering

---
 .../uavobjectbrowserwidget.cpp                | 21 ++++++++-----------
 .../uavobjectbrowser/uavobjectbrowserwidget.h |  2 --
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp b/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
index bd6d6ee90..cdca774c9 100644
--- a/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
+++ b/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
@@ -27,22 +27,19 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 #include "uavobjectbrowserwidget.h"
+
+#include "ui_uavobjectbrowser.h"
+#include "ui_viewoptions.h"
+
 #include "uavobjecttreemodel.h"
 #include "browseritemdelegate.h"
 #include "treeitem.h"
-#include "ui_uavobjectbrowser.h"
-#include "ui_viewoptions.h"
 #include "uavobjectmanager.h"
-#include <QStringList>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QComboBox>
-#include <QtCore/QDebug>
-#include <QItemEditorFactory>
 #include "extensionsystem/pluginmanager.h"
 #include "utils/mustache.h"
 
+#include <QDebug>
+
 UAVObjectBrowserWidget::UAVObjectBrowserWidget(QWidget *parent) : QWidget(parent)
 {
     m_viewoptionsDialog = new QDialog(this);
@@ -403,14 +400,14 @@ void UAVObjectBrowserWidget::updateDescription()
 }
 
 /**
- * @brief UAVObjectBrowserWidget::searchTextChanged Looks for matching text in the UAVO fields
+ * @brief UAVObjectBrowserWidget::searchLineChanged Looks for matching text in the UAVO fields
  */
-
 void UAVObjectBrowserWidget::searchLineChanged(QString searchText)
 {
     m_modelProxy->setFilterRegExp(QRegExp(searchText, Qt::CaseInsensitive, QRegExp::FixedString));
     if (!searchText.isEmpty()) {
-        m_browser->treeView->expandAll();
+        int depth = m_viewoptions->cbCategorized->isChecked() ? 2 : 1;
+        m_browser->treeView->expandToDepth(depth);
     } else {
         m_browser->treeView->collapseAll();
     }
diff --git a/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h b/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h
index 5ddc5c0a1..d5d536dd7 100644
--- a/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h
+++ b/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h
@@ -35,8 +35,6 @@
 #include "objectpersistence.h"
 
 #include <QWidget>
-#include <QTreeView>
-#include <QKeyEvent>
 #include <QSortFilterProxyModel>
 
 class QPushButton;