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

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit c50b4cb4b69597400a8325e0a200c95cf41c62f0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 9 16:21:26 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 9 18:34:31 2019 +0100

    Enable/Disable of children shouldn't be necessary
    
    the builder counterpart to...
    
    commit 1d69cf32a73c0720882731ebf3eb5d2f07fce246
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Fri Oct 18 19:23:40 2019 +0100
    
        Enable/Disable of children shouldn't be necessary
    
    Change-Id: Iaad132d1cabf657d884e38b33a167ed165216f43
    Reviewed-on: https://gerrit.libreoffice.org/84773
    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/source/window/builder.cxx b/vcl/source/window/builder.cxx
index fca79c624896..07e54d1340db 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2422,6 +2422,10 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
     SAL_INFO_IF(!xWindow, "vcl.layout", "probably need to implement " << name << " or add a make" << name << " function");
     if (xWindow)
     {
+        // child windows of disabled windows are made disabled by vcl by default, we don't want that
+        WindowImpl *pWindowImpl = xWindow->ImplGetWindowImpl();
+        pWindowImpl->mbDisabled = false;
+
         xWindow->SetHelpId(m_sHelpRoot + id);
         SAL_INFO("vcl.layout", "for " << name <<
             ", created " << xWindow.get() << " child of " <<