From bf984e8d1ae01f8bf8c219fff77faa87017561c9 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 26 Sep 2017 19:05:36 -0700
Subject: [PATCH] Fix tablet asset browser

---
 interface/resources/qml/hifi/AssetServer.qml  | 18 +++++++-------
 .../qml/hifi/dialogs/TabletAssetServer.qml    | 24 ++++++++++++-------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index d2866d8262..276c93d8dd 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -66,6 +66,15 @@ ScrollingWindow {
         letterboxMessage.popupRadius = 0;
     }
 
+    function errorMessageBox(message) {
+        return desktop.messageBox({
+            icon: hifi.icons.warning,
+            defaultButton: OriginalDialogs.StandardButton.Ok,
+            title: "Error",
+            text: message
+        });
+    }
+
     function doDeleteFile(path) {
         console.log("Deleting " + path);
 
@@ -453,15 +462,6 @@ ScrollingWindow {
             });
         }
     }
-
-    function errorMessageBox(message) {
-        return desktop.messageBox({
-            icon: hifi.icons.warning,
-            defaultButton: OriginalDialogs.StandardButton.Ok,
-            title: "Error",
-            text: message
-        });
-    }
     
     Item {
         width: pane.contentWidth
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index ee38c278a5..24267f3a96 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -66,6 +66,15 @@ Rectangle {
         letterboxMessage.visible = true;
         letterboxMessage.popupRadius = 0;
     }
+    
+    function errorMessageBox(message) {
+        return tabletRoot.messageBox({
+            icon: hifi.icons.warning,
+            defaultButton: OriginalDialogs.StandardButton.Ok,
+            title: "Error",
+            text: message
+        });
+    }
 
     function doDeleteFile(path) {
         console.log("Deleting " + path);
@@ -454,14 +463,11 @@ Rectangle {
             });
         }
     }
-
-    function errorMessageBox(message) {
-        return tabletRoot.messageBox({
-            icon: hifi.icons.warning,
-            defaultButton: OriginalDialogs.StandardButton.Ok,
-            title: "Error",
-            text: message
-        });
+    
+    // The letterbox used for popup messages
+    LetterboxMessage {
+        id: letterboxMessage;
+        z: 999; // Force the popup on top of everything else
     }
 
     Column {
@@ -773,7 +779,7 @@ Rectangle {
             id: infoRow
             anchors.left: treeView.left
             anchors.right: treeView.right
-            anchors.bottom: uploadSection.top
+            anchors.bottomMargin: hifi.dimensions.contentSpacing.y
             
             RalewayRegular {
                 anchors.verticalCenter: parent.verticalCenter