From d84c7e514330c28d72071ebab685c4efcd0d0618 Mon Sep 17 00:00:00 2001
From: Gregory Morse <gregory.morse@live.com>
Date: Sun, 21 Jan 2018 07:26:48 +0100
Subject: [PATCH] Merge pull request #10649 from GregoryMorse:patch-3

* Fix for QT image window rectangle

* Update window_QT.h

* Update window_QT.cpp

* trailing whitespace

* highgui: fix QT getWindowImageRect()
---
 modules/highgui/src/window_QT.cpp | 15 ++++++++-------
 modules/highgui/src/window_QT.h   |  1 +
 modules/highgui/test/test_gui.cpp |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp
index c161a66a9b..6317d78287 100644
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -967,13 +967,7 @@ CvRect GuiReceiver::getWindowRect(QString name)
     if (!w)
         return cvRect(-1, -1, -1, -1);
 
-    QPoint org = w->myView->mapToGlobal(new QPoint(0, 0));
-#ifdef HAVE_QT_OPENGL
-    if (isOpenGl()) {
-        return cvRect(w->myView->pos().x() + org.x, w->myView->pos().y() + org.y, w->myView->width(), w->myView->height());
-    } else
-#endif
-    return cvRect(w->myView->viewport()->pos().x() + org.x, w->myView->viewport()->pos().y() + org.y, w->myView->viewport()->width(), w->myView->viewport()->height());
+    return w->getWindowRect();
 }
 
 double GuiReceiver::isFullScreen(QString name)
@@ -1781,6 +1775,13 @@ void CvWindow::setRatio(int flags)
     myView->setRatio(flags);
 }
 
+CvRect CvWindow::getWindowRect()
+{
+    QWidget* view = myView->getWidget();
+    QRect local_rc = view->geometry(); // http://doc.qt.io/qt-5/application-windows.html#window-geometry
+    QPoint global_pos = /*view->*/mapToGlobal(QPoint(local_rc.x(), local_rc.y()));
+    return cvRect(global_pos.x(), global_pos.y(), local_rc.width(), local_rc.height());
+}
 
 int CvWindow::getPropWindow()
 {
diff --git a/modules/highgui/src/window_QT.h b/modules/highgui/src/window_QT.h
index d86321aad0..77f43a5919 100644
--- a/modules/highgui/src/window_QT.h
+++ b/modules/highgui/src/window_QT.h
@@ -299,6 +299,7 @@ public:
     double getRatio();
     void setRatio(int flags);
 
+    CvRect getWindowRect();
     int getPropWindow();
     void setPropWindow(int flags);
 
diff --git a/modules/highgui/test/test_gui.cpp b/modules/highgui/test/test_gui.cpp
index 8efd24e9d9..e271c08fc3 100644
--- a/modules/highgui/test/test_gui.cpp
+++ b/modules/highgui/test/test_gui.cpp
@@ -84,7 +84,8 @@ void CV_HighGuiOnlyGuiTest::run( int /*start_from */)
     waitKey(500);
 
     ts->printf(ts->LOG, "GUI 8\n");
-    getWindowImageRect("Win");
+    Rect rc = getWindowImageRect("Win");
+    std::cout << "window image rect: " << rc << std::endl;
 
     ts->printf(ts->LOG, "GUI 9\n");
     destroyAllWindows();