Merge with branch1.2

1 files changed, 8 insertions, 1 deletions

diff --git a/src/modlistview.cpp b/src/modlistview.cpp
index 1a4f6266..50a13a8c 100644
--- a/src/modlistview.cpp
+++ b/src/modlistview.cpp
@@ -36,8 +36,9 @@ void ModListViewStyle::drawPrimitive(PrimitiveElement element, const QStyleOptio
 

 ModListView::ModListView(QWidget *parent)

   : QTreeView(parent)

+  , m_Scrollbar(new ViewMarkingScrollBar(this->model(), this))

 {

-//  setStyle(new ModListViewStyle(style(), indentation()));

+  setVerticalScrollBar(m_Scrollbar);

 }

 

 void ModListView::dragEnterEvent(QDragEnterEvent *event)

@@ -46,3 +47,9 @@ void ModListView::dragEnterEvent(QDragEnterEvent *event)
 

   QTreeView::dragEnterEvent(event);

 }

+

+void ModListView::setModel(QAbstractItemModel *model)

+{

+  QTreeView::setModel(model);

+  setVerticalScrollBar(new ViewMarkingScrollBar(model, this));

+}