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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/tpcolor.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 22743603384ebc65643336b165087124f1834e8e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 24 10:21:34 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 24 12:37:09 2019 +0200

    replace LogicToPixel uses in SfxTabPages
    
    Change-Id: Ic1a132113b343d7253533763df5f3371d3b672e4
    Reviewed-on: https://gerrit.libreoffice.org/79446
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 72526db27fff..1f7abce1eafb 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -79,9 +79,11 @@ SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
     , m_xValSetColorListWin(new weld::CustomWeld(*m_xBuilder, "colorset", *m_xValSetColorList))
     , m_xValSetRecentListWin(new weld::CustomWeld(*m_xBuilder, "recentcolorset", *m_xValSetRecentList))
 {
-    Size aSize = LogicToPixel(Size(100 , 80), MapMode(MapUnit::MapAppFont));
+    Size aSize(m_xBtnWorkOn->get_approximate_digit_width() * 25,
+               m_xBtnWorkOn->get_text_height() * 10);
     m_xValSetColorList->set_size_request(aSize.Width(), aSize.Height());
-    aSize = LogicToPixel(Size(34 , 25), MapMode(MapUnit::MapAppFont));
+    aSize = Size(m_xBtnWorkOn->get_approximate_digit_width() * 8,
+                 m_xBtnWorkOn->get_text_height() * 3);
     m_aCtlPreviewOld.set_size_request(aSize.Width(), aSize.Height());
     m_aCtlPreviewNew.set_size_request(aSize.Width(), aSize.Height());
     // this page needs ExchangeSupport