[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx   |    1 +
 vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 75c3fa3cfc6da7721f81c96c43e7f020346f196a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 21 11:48:42 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jun 21 14:55:50 2021 +0200

    gtk4: set file dialog explicitly modal
    
    Change-Id: I88427abcde6c88b08c013a2502c0c25a84b970c4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117572
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index 2b5081463403..d2d5c6ea7642 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -121,6 +121,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
                                         "title", OUStringToOString(aFilePickerTitle, RTL_TEXTENCODING_UTF8).getStr(),
                                         "action", GTK_FILE_CHOOSER_ACTION_OPEN,
                                         nullptr));
+    gtk_window_set_modal(GTK_WINDOW(m_pDialog), true);
     gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
 
 #if !GTK_CHECK_VERSION(4, 0, 0)
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
index 2f79e3d8ba59..4297d9bcfd19 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
@@ -47,6 +47,7 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon
         OUStringToOString( getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
         nullptr, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, getCancelText().getStr(), GTK_RESPONSE_CANCEL,
         getOKText().getStr(), GTK_RESPONSE_ACCEPT, nullptr );
+    gtk_window_set_modal(GTK_WINDOW(m_pDialog), true);
 
     gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
 #if !GTK_CHECK_VERSION(4, 0, 0)