From 407921c33e579e025f5c080443aa65fb4e4eac08 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 31 Jul 2012 21:33:22 +0200
Subject: [PATCH] updates decoration

still buggy
---
 active/app/package/contents/ui/TreeDelegate.qml | 12 ++++++++++--
 active/components/documentitem.cpp              |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/active/app/package/contents/ui/TreeDelegate.qml b/active/app/package/contents/ui/TreeDelegate.qml
index 10012668a..249acd5e1 100644
--- a/active/app/package/contents/ui/TreeDelegate.qml
+++ b/active/app/package/contents/ui/TreeDelegate.qml
@@ -30,7 +30,7 @@ Column {
 
     MouseArea {
         width: parent.width
-        height: childrenRect.height
+        height: label.height
         visible: display.toLowerCase().indexOf(searchField.searchQuery.toLowerCase()) !== -1
 
         onClicked: {
@@ -40,10 +40,18 @@ Column {
             resourceBrowser.open = false
         }
 
+        QIconItem {
+            id: icon
+            icon: decoration
+            width: theme.smallIconSize
+            height: width
+            anchors.verticalCenter: parent.verticalCenter
+        }
         PlasmaComponents.Label {
             id: label
             text: display
             verticalAlignment: Text.AlignBottom
+            anchors.left: icon.right
         }
         //there isn't a sane way to do a dotted line in QML1
         Rectangle {
@@ -58,7 +66,7 @@ Column {
         }
         PlasmaComponents.Label {
             id: pageNumber
-            text: page
+            text: pageLabel
             anchors.right: parent.right
             verticalAlignment: Text.AlignBottom
             anchors.rightMargin: 40
diff --git a/active/components/documentitem.cpp b/active/components/documentitem.cpp
index d5d49fbb4..67c9bb66d 100644
--- a/active/components/documentitem.cpp
+++ b/active/components/documentitem.cpp
@@ -49,8 +49,8 @@ void DocumentItem::setPath(const QString &path)
     //TODO: remote urls
     m_document->openDocument(path, KUrl(path), KMimeType::findByUrl(KUrl(path)));
 
-    m_tocModel->setCurrentViewport(m_document->viewport());
     m_tocModel->fill(m_document->documentSynopsis());
+    m_tocModel->setCurrentViewport(m_document->viewport());
 
     m_matchingPages.clear();
     for (uint i = 0; i < m_document->pages(); ++i) {
@@ -71,6 +71,7 @@ QString DocumentItem::path() const
 void DocumentItem::setCurrentPage(int page)
 {
     m_document->setViewportPage(page);
+    m_tocModel->setCurrentViewport(m_document->viewport());
     emit currentPageChanged();
 }