From a3a13506765bbad336b85424ea37db5a459fa154 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 20 Jan 2015 15:22:30 -0800
Subject: [PATCH] repairs to QInputDialog placement

---
 gvr-interface/src/GVRMainWindow.cpp | 27 +++++++++++++++++++++++----
 gvr-interface/src/GVRMainWindow.h   |  4 ++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/gvr-interface/src/GVRMainWindow.cpp b/gvr-interface/src/GVRMainWindow.cpp
index 4ef2dd37fa..02788b81f1 100644
--- a/gvr-interface/src/GVRMainWindow.cpp
+++ b/gvr-interface/src/GVRMainWindow.cpp
@@ -10,6 +10,7 @@
 //
 
 #include <QtWidgets/QApplication>
+#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QMenuBar>
 
@@ -34,11 +35,29 @@ GVRMainWindow::GVRMainWindow(QWidget* parent) :
     fileMenu->addAction(goToAddress);
     helpMenu->addAction(aboutQt);
 
-    QObject::connect(goToAddress, &QAction::triggered, this, &GVRMainWindow::showAddressBar);
-    QObject::connect(aboutQt, &QAction::triggered, qApp, &QApplication::aboutQt);
+    connect(goToAddress, &QAction::triggered, this, &GVRMainWindow::showAddressBar);
+    connect(aboutQt, &QAction::triggered, qApp, &QApplication::aboutQt);
+    
+    QWidget* baseWidget = new QWidget(this);
+    
+    // setup a layout so we can vertically align to top
+    _mainLayout = new QVBoxLayout(baseWidget);
+    _mainLayout->setAlignment(Qt::AlignTop);
+    
+    // set the layout on the base widget
+    baseWidget->setLayout(_mainLayout);
+    
+    setCentralWidget(baseWidget);
 }
 
 void GVRMainWindow::showAddressBar() {
-    QString addressString = QInputDialog::getText(centralWidget(), "Go to Address", "Address");
-    DependencyManager::get<AddressManager>()->handleLookupString(addressString);
+    // setup the address QInputDialog
+    QInputDialog* addressDialog = new QInputDialog(this);
+    addressDialog->setLabelText("Address");
+    
+    // add the address dialog to the main layout
+    _mainLayout->addWidget(addressDialog);
+    
+    connect(addressDialog, &QInputDialog::textValueSelected, 
+            DependencyManager::get<AddressManager>().data(), &AddressManager::handleLookupString);
 }
\ No newline at end of file
diff --git a/gvr-interface/src/GVRMainWindow.h b/gvr-interface/src/GVRMainWindow.h
index 5a0846da7a..3d7e80e6b8 100644
--- a/gvr-interface/src/GVRMainWindow.h
+++ b/gvr-interface/src/GVRMainWindow.h
@@ -14,12 +14,16 @@
 
 #include <QtWidgets/QMainWindow>
 
+class QVBoxLayout;
+
 class GVRMainWindow : public QMainWindow {
     Q_OBJECT
 public:
     GVRMainWindow(QWidget* parent = 0);
 public slots:
     void showAddressBar();
+private:
+    QVBoxLayout* _mainLayout;
 };
 
 #endif // hifi_GVRMainWindow_h