summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-05-24 14:29:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-05-24 16:31:40 +0200
commit5ca3dd6b9e531421bc7d3e66109e27e8df15b1e6 (patch)
tree7957132d3bbe78ff93ead0108d96aa27ebc0cfd2 /vcl/inc
parentcb5e49907a2970f6d2820bbc6061ccc7ed0bea93 (diff)
gtk4: restore GtkFixed container for SalObjects
put the DrawingArea into an Overlay so the overlay will take the size of the DrawingArea. Put a GtkFixed into that overlay which will then also mirror the size of the DrawingArea. Keep that GtkFixed because the SalObject stuff is set up to use a GtkFixed and its just easier to do it this way than use the overlay directly. Change-Id: I937b3740fd809660ee0edef56d5cf036f2503892 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116059 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 6c5b01d7c28e..645dbd9ac794 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -177,7 +177,8 @@ class GtkSalFrame final : public SalFrame
GtkFixed* m_pFixedContainer;
GtkFixed* m_pDrawingArea;
#else
- GtkOverlay* m_pFixedContainer;
+ GtkOverlay* m_pOverlay;
+ GtkFixed* m_pFixedContainer;
GtkDrawingArea* m_pDrawingArea;
GtkEventControllerKey* m_pKeyController;
#endif