4 files changed, 15 insertions, 17 deletions

diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx
index 963572ca819b..40954f66d744 100644
--- a/vcl/inc/qt5/QtFrame.hxx
+++ b/vcl/inc/qt5/QtFrame.hxx
@@ -131,7 +131,6 @@ class VCLPLUG_QT_PUBLIC QtFrame : public QObject, public SalFrame
     bool isMinimized() const;
     bool isMaximized() const;
     void SetWindowStateImpl(Qt::WindowStates eState);
-    int menuBarOffset() const;
 
     void fixICCCMwindowGroup();
 
@@ -146,6 +145,8 @@ public:
     QtMainWindow* GetTopLevelWindow() const { return m_pTopLevel; }
     QWidget* asChild() const;
     qreal devicePixelRatioF() const;
+    QPoint mapToParent(const QPoint&) const;
+    QPoint mapFromParent(const QPoint&) const;
 
     void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth,
                 sal_Int32 nExtentsHeight) const;
diff --git a/vcl/inc/qt5/QtMenu.hxx b/vcl/inc/qt5/QtMenu.hxx
index a1b77687ce86..6bb0dbcab4ec 100644
--- a/vcl/inc/qt5/QtMenu.hxx
+++ b/vcl/inc/qt5/QtMenu.hxx
@@ -69,14 +69,15 @@ private:
 public:
     QtMenu(bool bMenuBar);
 
-    virtual bool VisibleMenuBar() override; // must return TRUE to actually DISPLAY native menu bars
+    virtual bool HasNativeMenuBar() override;
+    virtual int GetMenuBarHeight() const override;
+    virtual void ShowMenuBar(bool bVisible) override;
 
     virtual void InsertItem(SalMenuItem* pSalMenuItem, unsigned nPos) override;
     virtual void RemoveItem(unsigned nPos) override;
     virtual void SetSubMenu(SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos) override;
     virtual void SetFrame(const SalFrame* pFrame) override;
     const QtFrame* GetFrame() const;
-    virtual void ShowMenuBar(bool bVisible) override;
     virtual bool ShowNativePopupMenu(FloatingWindow* pWin, const tools::Rectangle& rRect,
                                      FloatWinPopupFlags nFlags) override;
     QtMenu* GetTopLevel();
@@ -95,7 +96,6 @@ public:
     virtual bool AddMenuBarButton(const SalMenuButtonItem&) override;
     virtual void RemoveMenuBarButton(sal_uInt16 nId) override;
     virtual tools::Rectangle GetMenuBarButtonRectPixel(sal_uInt16 nId, SalFrame*) override;
-    virtual int GetMenuBarHeight() const override;
 
     void SetMenu(Menu* pMenu) { mpVCLMenu = pMenu; }
     Menu* GetMenu() { return mpVCLMenu; }
diff --git a/vcl/inc/qt5/QtPainter.hxx b/vcl/inc/qt5/QtPainter.hxx
index 9702a19bdbe4..755a51f606ef 100644
--- a/vcl/inc/qt5/QtPainter.hxx
+++ b/vcl/inc/qt5/QtPainter.hxx
@@ -34,34 +34,26 @@ class QtPainter final : public QPainter
 public:
     QtPainter(QtGraphicsBackend& rGraphics, bool bPrepareBrush = false,
               sal_uInt8 nTransparency = 255);
-    ~QtPainter()
-    {
-        if (m_rGraphics.m_pFrame && !m_aRegion.isEmpty())
-            m_rGraphics.m_pFrame->GetQWidget()->update(m_aRegion);
-    }
+    ~QtPainter();
 
     void update(int nx, int ny, int nw, int nh)
     {
         if (m_rGraphics.m_pFrame)
-            m_aRegion += scaledQRect({ nx, ny, nw, nh }, 1 / m_rGraphics.devicePixelRatioF());
+            m_aRegion += QRect(nx, ny, nw, nh);
     }
 
     void update(const QRect& rRect)
     {
         if (m_rGraphics.m_pFrame)
-            m_aRegion += scaledQRect(rRect, 1 / m_rGraphics.devicePixelRatioF());
+            m_aRegion += rRect;
     }
 
-    void update(const QRectF& rRectF)
-    {
-        if (m_rGraphics.m_pFrame)
-            update(scaledQRect(rRectF.toAlignedRect(), 1 / m_rGraphics.devicePixelRatioF()));
-    }
+    void update(const QRectF& rRectF) { update(rRectF.toAlignedRect()); }
 
     void update()
     {
         if (m_rGraphics.m_pFrame)
-            m_aRegion += m_rGraphics.m_pFrame->GetQWidget()->rect();
+            m_aRegion += m_rGraphics.m_pFrame->GetQWidget()->geometry();
     }
 };
 
diff --git a/vcl/inc/qt5/QtTools.hxx b/vcl/inc/qt5/QtTools.hxx
index 534fe74de772..669b5bef6df0 100644
--- a/vcl/inc/qt5/QtTools.hxx
+++ b/vcl/inc/qt5/QtTools.hxx
@@ -69,6 +69,11 @@ inline QRect scaledQRect(const QRect& rRect, const qreal fScale)
                  ceil(rRect.height() * fScale));
 }
 
+inline QSize scaledQSize(const QSize& rSize, const qreal fScale)
+{
+    return QSize(ceil(rSize.width() * fScale), ceil(rSize.height() * fScale));
+}
+
 inline tools::Rectangle toRectangle(const QRect& rRect)
 {
     return tools::Rectangle(rRect.left(), rRect.top(), rRect.right(), rRect.bottom());