svx/source/dialog/charmap.cxx | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 9e7bf5d38588adaddb371e4daed318e1b24ccc05
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 19 14:21:10 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 19 16:49:13 2018 +0100
tdf#121232 set a size request that will result in a 0 m_nXGap by default
Change-Id: I25ce389bd46beff2dd9b0507581736f2f9511383
Reviewed-on: https://gerrit.libreoffice.org/63574
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 1b78839c4f97..0d8a869a63d6 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -82,8 +82,16 @@
SvxShowCharSet::SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWi
void SvxShowCharSet::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
CustomWidgetController::SetDrawingArea(pDrawingArea);
- mxScrollArea->set_size_request(COLUMN_COUNT *
pDrawingArea->get_approximate_digit_width() * 4,
- ROW_COUNT * pDrawingArea->get_text_height()
* 2);
+
+ Size aSize(COLUMN_COUNT * pDrawingArea->get_approximate_digit_width() *
5.25,
+ ROW_COUNT * pDrawingArea->get_text_height() * 2);
+
+ nX = aSize.Width() / COLUMN_COUNT;
+ nY = aSize.Height() / ROW_COUNT;
+
+ // tdf#121232 set a size request that will result in a 0 m_nXGap by default
+ mxScrollArea->set_size_request(COLUMN_COUNT * nX +
mxScrollArea->get_vscroll_width() + 2,
+ ROW_COUNT * nY);
}
void SvxShowCharSet::init()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
