diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-23 16:06:18 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-23 16:07:30 +0000 |
commit | 5013abeb191cdc6f8375f107a4d30abd802547d2 (patch) | |
tree | 6131a395b72bf5d7954c657b93e3efe45a029eef /extensions | |
parent | 692424b8058673c4366be7a351e30a2e61d15fc1 (diff) |
Resolves: tdf#106461 use a row height of max of edit and listbox height
not just take the listbox because edits can be taller and result in
overlaps
Change-Id: I6067b384484d933727220febda723bc9e8c5e90b
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 3bc041964e1a..0e8055b436a0 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -326,9 +326,11 @@ namespace pcr ,m_bUpdate(true) ,m_pControlContextImpl( new PropertyControlContext_Impl( *this ) ) { - ScopedVclPtrInstance< ListBox > aListBox(this,WB_DROPDOWN); - aListBox->SetPosSizePixel(Point(0,0),Size(100,100)); - m_nRowHeight = aListBox->GetSizePixel().Height()+2; + ScopedVclPtrInstance<ListBox> aListBox(this, WB_DROPDOWN); + ScopedVclPtrInstance<Edit> aEditBox(this); + m_nRowHeight = std::max(aListBox->get_preferred_size().Height(), + aEditBox->get_preferred_size().Height()); + m_nRowHeight += 2; SetBackground( pParent->GetBackground() ); m_aLinesPlayground->SetBackground( GetBackground() ); @@ -339,7 +341,6 @@ namespace pcr m_aVScroll->SetScrollHdl(LINK(this, OBrowserListBox, ScrollHdl)); } - OBrowserListBox::~OBrowserListBox() { disposeOnce(); |