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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 36ed48a4f75fd9f014d161a48de5d11dc941b1cf
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 6 12:13:34 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 6 17:29:04 2019 +0200

    duplicated about dialog close button when headerbars not enabled
    
    Change-Id: Idd69b37ff0dc85dc96349c4e85fc5d4a93597e62
    Reviewed-on: https://gerrit.libreoffice.org/73601
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index c7459a81a1f4..eb1511d5f53a 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3389,6 +3389,11 @@ public:
         , m_pAboutDialog(pAboutDialog)
         , m_pCssProvider(nullptr)
     {
+        // in GtkAboutDialog apply_use_header_bar if headerbar is false it
+        // automatically adds a default close button which it doesn't if
+        // headerbar is true and which doesn't appear in the .ui
+        if (GtkWidget* pDefaultButton = gtk_dialog_get_widget_for_response(GTK_DIALOG(pAboutDialog), GTK_RESPONSE_DELETE_EVENT))
+            gtk_widget_destroy(pDefaultButton);
     }
 
     virtual void set_version(const OUString& rVersion) override