From 03b6280ed02cdfc13e4bcee962e20a0c20c3702f Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Wed, 15 Feb 2017 16:50:08 -0800
Subject: [PATCH] Fix for empty toolbar issue

---
 interface/resources/qml/hifi/toolbars/Toolbar.qml        | 3 ---
 libraries/script-engine/src/TabletScriptingInterface.cpp | 4 ++++
 libraries/script-engine/src/TabletScriptingInterface.h   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/hifi/toolbars/Toolbar.qml b/interface/resources/qml/hifi/toolbars/Toolbar.qml
index 1cd9350562..f62e4dea19 100644
--- a/interface/resources/qml/hifi/toolbars/Toolbar.qml
+++ b/interface/resources/qml/hifi/toolbars/Toolbar.qml
@@ -125,9 +125,6 @@ Window {
     }
 
     function addButton(properties) {
-
-        visible = true;
-
         properties = properties || {}
 
         // If a name is specified, then check if there's an existing button with that name
diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp
index 432fd7cf34..0e048206e6 100644
--- a/libraries/script-engine/src/TabletScriptingInterface.cpp
+++ b/libraries/script-engine/src/TabletScriptingInterface.cpp
@@ -14,6 +14,7 @@
 #include "DependencyManager.h"
 #include <PathUtils.h>
 #include <QmlWindowClass.h>
+#include <QQmlProperty>
 #include <RegisteredMetaTypes.h>
 #include "ScriptEngineLogging.h"
 #include <OffscreenUi.h>
@@ -543,6 +544,9 @@ void TabletProxy::addButtonsToToolbar() {
             qCWarning(scriptengine) << "ToolbarProxy addButton has no result";
         }
     }
+
+    // make the toolbar visible
+    QMetaObject::invokeMethod(toolbarProxy, "writeProperty", Qt::AutoConnection, Q_ARG(QString, "visible"), Q_ARG(QVariant, QVariant(true)));
 }
 
 void TabletProxy::removeButtonsFromToolbar() {
diff --git a/libraries/script-engine/src/TabletScriptingInterface.h b/libraries/script-engine/src/TabletScriptingInterface.h
index 88e1cca60b..3a095e5575 100644
--- a/libraries/script-engine/src/TabletScriptingInterface.h
+++ b/libraries/script-engine/src/TabletScriptingInterface.h
@@ -173,7 +173,7 @@ signals:
     void fromQml(QVariant msg);
 
     /**jsdoc
-     * Signales when this tablet screen changes.
+     * Signaled when this tablet screen changes.
      * @function TabletProxy#screenChanged
      * @param type {string} - "Home", "Web", "Menu", "QML", "Closed"
      * @param url {string} - only valid for Web and QML.