summaryrefslogtreecommitdiff
path: root/vcl/inc/qt5/Qt5Frame.hxx
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2018-08-09 17:14:14 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-08-12 22:25:54 +0200
commit8d791a9d9657f6573ce27947c0289b36c6eba77c (patch)
tree0a5a788620f7c7ec4404a45f81e8f3b8c5722db2 /vcl/inc/qt5/Qt5Frame.hxx
parent20444972edb1dd49af13902a850a8e343d5a60ec (diff)
Set Qt5Widget to be a central widget of QMainWindow
this is meant to solve the problem of native menu bar overlapping w/ non-native, as well as the inability to place an object or select text dragging the mouse cursor w/ LMB pressed Change-Id: I29f590ebf79d1ecc7e17b402125384cf13774bf3 Reviewed-on: https://gerrit.libreoffice.org/58171 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'vcl/inc/qt5/Qt5Frame.hxx')
-rw-r--r--vcl/inc/qt5/Qt5Frame.hxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 310298879e52..04ade0b38b2d 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -31,7 +31,9 @@ class Qt5Graphics;
class Qt5Instance;
class Qt5Menu;
class QWidget;
+class Qt5MainWindow;
class QPaintDevice;
+class QScreen;
class QImage;
class SvpSalGraphics;
@@ -39,7 +41,8 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
{
friend class VclQtMixinBase;
- std::unique_ptr<QWidget> m_pQWidget;
+ QWidget* m_pQWidget;
+ Qt5MainWindow* m_pTopLevel;
const bool m_bUseCairo;
std::unique_ptr<QImage> m_pQImage;
@@ -76,6 +79,10 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
return bool(m_nStyle & nMask);
}
+ bool isWindow();
+ QWindow* windowHandle();
+ QScreen* screen();
+
void TriggerPaintEvent();
void TriggerPaintEvent(QRect aRect);
@@ -83,7 +90,8 @@ public:
Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nSalFrameStyle, bool bUseCairo);
virtual ~Qt5Frame() override;
- QWidget* GetQWidget() const { return m_pQWidget.get(); }
+ QWidget* GetQWidget() const { return m_pQWidget; }
+ Qt5MainWindow* GetTopLevelWindow() const { return m_pTopLevel; }
void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth,
sal_Int32 nExtentsHeight) const;