From 4ab5b4a5e641ad6d3cd350bc2512009bee6886e8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 11 Mar 2020 05:02:06 +0100
Subject: [PATCH] [calamares] Progress"tree" is a list

- No need for a TreeView when it's just a one-dimensional
  list of items.
---
 src/calamares/progresstree/ProgressTreeView.cpp | 16 +++-------------
 src/calamares/progresstree/ProgressTreeView.h   |  9 ++-------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/calamares/progresstree/ProgressTreeView.cpp b/src/calamares/progresstree/ProgressTreeView.cpp
index f7496c5fb..22b11bfc6 100644
--- a/src/calamares/progresstree/ProgressTreeView.cpp
+++ b/src/calamares/progresstree/ProgressTreeView.cpp
@@ -24,26 +24,17 @@
 #include "ViewManager.h"
 
 ProgressTreeView::ProgressTreeView( QWidget* parent )
-    : QTreeView( parent )
+    : QListView( parent )
 {
     this->setObjectName( "sidebarMenuApp" );
     setFrameShape( QFrame::NoFrame );
     setContentsMargins( 0, 0, 0, 0 );
 
-    setHeaderHidden( true );
-    setRootIsDecorated( true );
-    setExpandsOnDoubleClick( true );
-
     setSelectionMode( QAbstractItemView::NoSelection );
     setDragDropMode( QAbstractItemView::NoDragDrop );
     setAcceptDrops( false );
-    setUniformRowHeights( false );
 
-    setIndentation( 0 );
-    setSortingEnabled( false );
-
-    m_delegate = new ProgressTreeDelegate( this );
-    setItemDelegate( m_delegate );
+    setItemDelegate( new ProgressTreeDelegate( this ) );
 
     QPalette plt = palette();
     plt.setColor( QPalette::Base,
@@ -63,8 +54,7 @@ ProgressTreeView::setModel( QAbstractItemModel* model )
         return;
     }
 
-    QTreeView::setModel( model );
-    expandAll();
+    QListView::setModel( model );
 
     connect(
         Calamares::ViewManager::instance(),
diff --git a/src/calamares/progresstree/ProgressTreeView.h b/src/calamares/progresstree/ProgressTreeView.h
index 0922bdf0a..4a1bf9f2d 100644
--- a/src/calamares/progresstree/ProgressTreeView.h
+++ b/src/calamares/progresstree/ProgressTreeView.h
@@ -20,15 +20,13 @@
 #ifndef PROGRESSTREEVIEW_H
 #define PROGRESSTREEVIEW_H
 
-#include <QTreeView>
-
-class ProgressTreeDelegate;
+#include <QListView>
 
 /**
  * @brief The ProgressTreeView class is a modified QTreeView which displays the
  * available view steps and the user's progress through them.
  */
-class ProgressTreeView : public QTreeView
+class ProgressTreeView : public QListView
 {
     Q_OBJECT
 public:
@@ -39,9 +37,6 @@ public:
      * @brief setModel assigns a model to this view.
      */
     void setModel( QAbstractItemModel* model ) override;
-
-private:
-    ProgressTreeDelegate* m_delegate;
 };
 
 #endif  // PROGRESSTREEVIEW_H