[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/QtFrame.cxx  |   11 +++++------
 vcl/qt5/QtWidget.cxx |    1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 27751b59bbedda69e3336a81db4acab80d1ab765
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Dec 20 13:02:33 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Dec 21 12:39:59 2021 +0100

    Qt use asChild for pointer positioning
    
    .. and refactor some variable names.
    
    Change-Id: I7d31a7a377f614bdd78f8d09852a2eda0cc47442
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127153
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
    (cherry picked from commit e63fe68fb1d0915b64fdf63f7fa6eed866fa3a0d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127173
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 5b8a6fad6d96..5772e7e87251 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -513,11 +513,10 @@ void QtFrame::SetDefaultPos()
     if (m_pParent)
     {
         const qreal fRatio = devicePixelRatioF();
-        QWidget* const pWindow = m_pParent->GetQWidget()->window();
-        QWidget* const pWidget = asChild();
-        QPoint aPos = pWindow->rect().center() - pWidget->rect().center();
-        SetPosSize(round(aPos.x() * fRatio), round(aPos.y() * fRatio), 0, 0,
-                   SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y);
+        QWidget* const pParentWin = m_pParent->asChild()->window();
+        QWidget* const pChildWin = asChild()->window();
+        QPoint aPos = (pParentWin->rect().center() - 
pChildWin->rect().center()) * fRatio;
+        SetPosSize(aPos.x(), aPos.y(), 0, 0, SAL_FRAME_POSSIZE_X | 
SAL_FRAME_POSSIZE_Y);
         assert(!m_bDefaultPos);
     }
     else
@@ -864,7 +863,7 @@ void QtFrame::SetPointerPos(tools::Long nX, tools::Long nY)
 {
     // some cursor already exists (and it has m_ePointerStyle shape)
     // so here we just reposition it
-    QCursor::setPos(m_pQWidget->mapToGlobal(QPoint(nX, nY)));
+    QCursor::setPos(asChild()->mapToGlobal(QPoint(nX, nY)));
 }
 
 void QtFrame::Flush()
diff --git a/vcl/qt5/QtWidget.cxx b/vcl/qt5/QtWidget.cxx
index 85bcd814b03a..8f672bdd6bac 100644
--- a/vcl/qt5/QtWidget.cxx
+++ b/vcl/qt5/QtWidget.cxx
@@ -258,6 +258,7 @@ void QtWidget::dropEvent(QDropEvent* pEvent) { 
m_rFrame.handleDrop(pEvent); }
 
 void QtWidget::moveEvent(QMoveEvent* pEvent)
 {
+    // already handled by QtMainWindow::moveEvent
     if (m_rFrame.m_pTopLevel)
         return;