commit d17d9500a23705a315992ff42cb7c449894fc2ce
author Caolán McNamara <caolanm@redhat.com> Tue Apr 16 14:49:46 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Wed Apr 17 11:24:11 2019 +0200
tree c4a64dbde5fb03c3e0d4031fdb2c4645ce57a0d4
parent 6e204253d4cf3be0b9ad136e922ec4fbb2523fe6

tdf#124597 template select dialog launched before parent gets final size

Change-Id: If9f6fa6e072a95381aaf4a539e2081733a0248ec
Reviewed-on: https://gerrit.libreoffice.org/70828
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/vcl/weld.hxx

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 77205ce..d2929d69 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -332,6 +332,10 @@ public:
    virtual bool get_resizable() const = 0;
    virtual Size get_size() const = 0;
    virtual Point get_position() const = 0;
    // ensure window will be centered on its parent, taking into account that
    // there may currently be pending geometry requests for the parent
    // not yet processed by the underlying toolkit
    virtual void set_centered_on_parent_geometry_request() = 0;
    virtual bool has_toplevel_focus() const = 0;
    virtual void present() = 0;
    virtual void set_window_state(const OString& rStr) = 0;

sfx2/source/doc/templatedlg.cxx

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 0136c42..77ca1eb9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1385,6 +1385,11 @@ SfxTemplateSelectionDlg::~SfxTemplateSelectionDlg()

short SfxTemplateSelectionDlg::run()
{
    // tdf#124597 at startup this dialog is launched before its parent window
    // has taken its final size. The parent size request is processed during
    // the dialogs event loop so configure this dialog to center to
    // the parents pending geometry request
    m_xDialog->set_centered_on_parent_geometry_request();
    return weld::GenericDialogController::run();
}

vcl/source/app/salvtables.cxx

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 310254b..59a9ab3 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -970,6 +970,18 @@ public:
        return m_xWindow->GetPosPixel();
    }

    virtual void set_centered_on_parent_geometry_request() override
    {
        if (vcl::Window* pParent = m_xWidget->GetParent())
        {
            Size aParentGeometry(pParent->GetSizePixel());
            Size aGeometry(m_xWidget->get_preferred_size());
            auto nX = (aParentGeometry.Width() - aGeometry.Width()) / 2;
            auto nY = (aParentGeometry.Height() - aGeometry.Height()) / 2;
            m_xWidget->SetPosPixel(Point(nX, nY));
        }
    }

    virtual bool get_resizable() const override
    {
        return m_xWindow->GetStyle() & WB_SIZEABLE;

vcl/unx/gtk3/gtk3gtkinst.cxx

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 19a3ed2..cb816b7 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2498,6 +2498,11 @@ public:
        return Point(current_x, current_y);
    }

    virtual void set_centered_on_parent_geometry_request() override
    {
        gtk_window_set_position(m_pWindow, GTK_WIN_POS_CENTER_ALWAYS);
    }

    virtual bool get_resizable() const override
    {
        return gtk_window_get_resizable(m_pWindow);