From ca636d9146fdaeddf3fdca47e30033b8ab569098 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 4 Jul 2017 09:54:11 +0200
Subject: [PATCH] Locator: Fix missing popup frame on Win/Lin

Change-Id: Idaea2197d8666a251cef46fa9032494e91cc29a1
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/coreplugin/locator/locatorwidget.cpp | 6 ++++--
 src/plugins/coreplugin/locator/locatorwidget.h   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index 59f5e9b6a4b..275b5b97377 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -284,7 +284,8 @@ void TopLeftLocatorPopup::updateGeometry()
 {
     QTC_ASSERT(parentWidget(), return);
     const QSize size = preferredSize();
-    const QRect rect(parentWidget()->mapToGlobal(QPoint(0, -size.height())), size);
+    const int border = m_tree->frameWidth();
+    const QRect rect(parentWidget()->mapToGlobal(QPoint(-border, -size.height() - border)), size);
     setGeometry(rect);
     LocatorPopup::updateGeometry();
 }
@@ -369,7 +370,8 @@ LocatorPopup::LocatorPopup(LocatorWidget *locatorWidget, QWidget *parent)
       m_tree(new CompletionList(this)),
       m_inputWidget(locatorWidget)
 {
-    m_tree->setFrameStyle(QFrame::NoFrame);
+    if (Utils::HostOsInfo::isMacHost())
+        m_tree->setFrameStyle(QFrame::NoFrame); // tool tip already includes a frame
     m_tree->setModel(locatorWidget->model());
 
     auto layout = new QVBoxLayout;
diff --git a/src/plugins/coreplugin/locator/locatorwidget.h b/src/plugins/coreplugin/locator/locatorwidget.h
index 3f42d05a3aa..4484faefdde 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.h
+++ b/src/plugins/coreplugin/locator/locatorwidget.h
@@ -122,11 +122,11 @@ protected:
     virtual void inputLostFocus();
 
     QPointer<QWidget> m_window;
+    CompletionList *m_tree;
 
 private:
     void updateWindow();
 
-    CompletionList *m_tree;
     LocatorWidget *m_inputWidget;
 };