[Libreoffice-commits] core.git: svtools/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 9 09:09:48 UTC 2020
svtools/source/dialogs/addresstemplate.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 23552e1bde1bb4682639847677964334e2576a9e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 8 14:13:15 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 9 11:09:08 2020 +0200
Resolves: tdf#136494 get preferred height after contents filled in
an empty widget appears to be less tall than one with content in the default
Ubuntu theme
Change-Id: I6b759b37d6706e6a4c3ded492d9c5b23f322e328
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102256
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 9b3c4e606c4e..6bf1fadb9663 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -496,7 +496,6 @@ void AssignmentPersistentData::ImplCommit()
m_xFieldScroller = m_xBuilder->weld_scrolled_window("scrollwindow");
m_xFieldScroller->set_user_managed_scrolling();
m_xGrid = m_xBuilder->weld_widget("grid");
- m_xFieldScroller->set_size_request(-1, m_xGrid->get_preferred_size().Height());
for (sal_Int32 row=0; row<FIELD_PAIRS_VISIBLE; ++row)
{
@@ -597,6 +596,8 @@ void AssignmentPersistentData::ImplCommit()
// initialize the field controls
resetFields();
+ // tdf#136494 wait until contents are filled before getting preferred height
+ m_xFieldScroller->set_size_request(-1, m_xGrid->get_preferred_size().Height());
m_xFieldScroller->vadjustment_set_value(0);
m_pImpl->nFieldScrollPos = -1;
implScrollFields(0, false, false);
More information about the Libreoffice-commits
mailing list