[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 814416d20f913bb823ba2348d2a9a76e7eaa7d76
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 16 21:04:45 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sat Aug 22 04:20:58 2020 +0200

    tdf#135743 ignore size-allocations triggered by an embedded SalObject
    
    getting configured, we already ignored them for painting, do the
    same for the size-requests it output from our internal configuring
    
    Change-Id: I4c0153535459b089ba6c31e3d9f09bfae2545806
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100793
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index b4757b39023c..5b85c5a78f05 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2928,13 +2928,16 @@ gboolean GtkSalFrame::signalDraw(GtkWidget*, cairo_t *cr, gpointer frame)
 void GtkSalFrame::sizeAllocated(GtkWidget* pWidget, GdkRectangle *pAllocation, gpointer frame)
 {
     GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
+    // ignore size-allocations that occur during configuring an embedded SalObject
+    if (pThis->m_bSalObjectSetPosSize)
+        return;
     pThis->maGeometry.nWidth = pAllocation->width;
     pThis->maGeometry.nHeight = pAllocation->height;
     bool bRealized = gtk_widget_get_realized(pWidget);
     if (bRealized)
         pThis->AllocateFrame();
     pThis->CallCallbackExc( SalEvent::Resize, nullptr );
-    if (bRealized && !pThis->m_bSalObjectSetPosSize)
+    if (bRealized)
         pThis->TriggerPaintEvent();
 }