summaryrefslogtreecommitdiff
path: root/vcl/inc/unx
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2018-06-11 02:08:54 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2018-06-11 21:39:38 +0200
commit0da89ede1fee3a9079b7b41ee8b34504ddeb5ee5 (patch)
tree2acd724efe8de0c1ad056d294e57de1b2b310c06 /vcl/inc/unx
parenta75cc6348ce578f619c7429f5157fae53eb08e01 (diff)
tdf#117175 wayland: Make popup windows not show off-screen
Depends on the gtk-3-24 dev branch, for the public gdk_window_move_to_rect symbol. Change-Id: Ic7a34ceb3d133ecac2addac54cf5f635eea332ed Reviewed-on: https://gerrit.libreoffice.org/55612 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 0940736738fa..b69b14bb002a 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -210,7 +210,10 @@ class GtkSalFrame : public SalFrame
#if GTK_CHECK_VERSION(3,0,0)
OUString m_aTooltip;
- tools::Rectangle m_aHelpArea;
+ tools::Rectangle m_aHelpArea;
+ tools::Rectangle m_aFloatRect;
+ FloatWinPopupFlags m_nFloatFlags;
+ bool m_bFloatPositioned;
long m_nWidthRequest;
long m_nHeightRequest;
cairo_region_t* m_pRegion;
@@ -532,6 +535,7 @@ public:
virtual void EndSetClipRegion() override;
#if GTK_CHECK_VERSION(3,0,0)
+ virtual void PositionByToolkit(const tools::Rectangle& rRect, FloatWinPopupFlags nFlags) override;
virtual void SetModal(bool bModal) override;
virtual bool ShowTooltip(const OUString& rHelpText, const tools::Rectangle& rHelpArea) override;
virtual void* ShowPopover(const OUString& rHelpText, const tools::Rectangle& rHelpArea, QuickHelpFlags nFlags) override;