Always select the first index (INBOX) in the folderlist initially.

3 files changed, 17 insertions, 6 deletions

diff --git a/framework/qml/FolderListView.qml b/framework/qml/FolderListView.qml
index 221ec31c..bf1f52e5 100644
--- a/framework/qml/FolderListView.qml
+++ b/framework/qml/FolderListView.qml
@@ -74,10 +74,4 @@ Kube.TreeView {
         accountId: root.accountId
     }
 
-    onActivated: {
-        //TODO do some event compression in case of double clicks
-        model.fetchMore(index);
-        Kube.Fabric.postMessage(Kube.Messages.folderSelection, {"folder": model.data(index, Kube.FolderListModel.DomainObject),
-                                                                "trash": model.data(index, Kube.FolderListModel.Trash)});
-    }
 }
diff --git a/framework/qml/InlineAccountSwitcher.qml b/framework/qml/InlineAccountSwitcher.qml
index b7f69588..2af1a455 100644
--- a/framework/qml/InlineAccountSwitcher.qml
+++ b/framework/qml/InlineAccountSwitcher.qml
@@ -86,6 +86,18 @@ FocusScope {
 
                     accountId: currentData.accountId
                     visible: isCurrent
+                    onVisibleChanged: {
+                        if (visible) {
+                            selectRootIndex()
+                        }
+                    }
+
+                    onActivated: {
+                        if (visible) {
+                            Kube.Fabric.postMessage(Kube.Messages.folderSelection, {"folder": model.data(index, Kube.FolderListModel.DomainObject),
+                                                                                    "trash": model.data(index, Kube.FolderListModel.Trash)});
+                        }
+                    }
                 }
             }
         }
diff --git a/framework/qml/TreeView.qml b/framework/qml/TreeView.qml
index d7fed711..ec249eb9 100644
--- a/framework/qml/TreeView.qml
+++ b/framework/qml/TreeView.qml
@@ -58,6 +58,11 @@ FocusScope {
         activated(treeView.selection.currentIndex)
     }
 
+    function selectRootIndex() {
+        treeView.selection.setCurrentIndex(model.index(0, 0), ItemSelectionModel.ClearAndSelect)
+        activated(treeView.selection.currentIndex)
+    }
+
     Flickable {
         id: flickableItem