vcl/source/window/layout.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c9f8e68ce3d56b0e52915a07d0bce661882039ee
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 22 20:46:29 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Dec 23 14:59:30 2020 +0100
if the label is explicitly set there is no ambiguity as to the label
a child-count of 3 can arise for a temporary period during loading of
widgets inside GtkScrolledWindow where the child widget supports its own
scrolling and is parented as a sibling of the GtkScrolledWindow during
load until the node is complete and then the redundant GtkScrolledWindow
is removed after mirroring its properties to the scrolled-child
Change-Id: I1a7dbf9ec2415beb0f7e920fec5c05e87ddaaeee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108221
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 2dbbedb4601b..d432002e7ade 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1441,9 +1441,9 @@ void VclFrame::designate_label(vcl::Window *pWindow)
const vcl::Window *VclFrame::get_label_widget() const
{
- assert(GetChildCount() == 2);
if (m_pLabel)
return m_pLabel;
+ assert(GetChildCount() == 2);
//The label widget is normally the first (of two) children
const WindowImpl* pWindowImpl = ImplGetWindowImpl();
if (pWindowImpl->mpFirstChild == pWindowImpl->mpLastChild) //no label
exists
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
