[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit efcf044731f40bd126a0efe7478d7fb905dff4eb
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Sep 17 09:36:24 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Sep 17 16:15:02 2019 +0200

    trac#29600 broadcast up/down of welded native modal dialogs like vcl ones
    
    This is basically a partial cherry-pick of upstream commit
    9ff8914166d6b26b654b10dbdb9d56b111b99ed4
    ("broadcast up/down of welded native modal dialogs like vcl one")
    for the part that is relevant for trac#29600.
    
    Only apply the relevant part from this commit, since further welding
    etc. that has happened on master makes it hard to find an end of
    underlying changes that would have to be backported in addition
    otherwise...
    
     Conflicts:
            vcl/source/app/salvtables.cxx
            vcl/source/window/dialog.cxx
            vcl/unx/gtk3/gtk3gtkinst.cxx
    
    Change-Id: I642ae1a75a6d225d88ab9568c22438fa9922d03f
    Reviewed-on: https://gerrit.libreoffice.org/79041
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 955705cdc72a..062cffc7d173 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2079,14 +2079,18 @@ struct DialogRunner
 
     void inc_modal_count()
     {
-        if (m_xFrameWindow)
+        if (m_xFrameWindow) {
             m_xFrameWindow->IncModalCount();
+            m_xFrameWindow->ImplGetFrame()->NotifyModalHierarchy(true);
+        }
     }
 
     void dec_modal_count()
     {
-        if (m_xFrameWindow)
+        if (m_xFrameWindow) {
             m_xFrameWindow->DecModalCount();
+            m_xFrameWindow->ImplGetFrame()->NotifyModalHierarchy(false);
+        }
     }
 
     // same as gtk_dialog_run except that unmap doesn't auto-respond