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

Caolán McNamara caolanm at redhat.com
Tue Mar 13 08:52:54 UTC 2018


 vcl/source/window/builder.cxx |    4 ++++
 vcl/source/window/layout.cxx  |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit 775b12866059defdb7ae90f7bffe8720fdaf8340
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 12 21:10:31 2018 +0000

    related: tdf#116264 give windows message dialogs less border width
    
    Change-Id: Ieced9b02515ffc7479bfc66ca501e20962d5572e
    Reviewed-on: https://gerrit.libreoffice.org/51172
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5156999b53a4..064c91a825f8 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1321,7 +1321,11 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
         VclPtr<MessageDialog> xDialog(VclPtr<MessageDialog>::Create(pParent, nBits));
         m_pParserState->m_aMessageDialogs.push_back(xDialog);
         xWindow = xDialog;
+#if defined WNT
+        xWindow->set_border_width(3);
+#else
         xWindow->set_border_width(12);
+#endif
     }
     else if (name == "GtkBox")
     {
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 2e8fec856ce2..16e1db86c99d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2276,7 +2276,11 @@ void MessageDialog::create_message_area()
 
 void MessageDialog::create_owned_areas()
 {
+#if defined WNT
+    set_border_width(3);
+#else
     set_border_width(12);
+#endif
     m_pOwnedContentArea.set(VclPtr<VclVBox>::Create(this, false, 24));
     set_content_area(m_pOwnedContentArea);
     m_pOwnedContentArea->Show();


More information about the Libreoffice-commits mailing list