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

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Thu Feb 4 14:13:15 UTC 2021


 vcl/source/treelist/iconview.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 217b9423e4bdabba096a9ab2440d796a69cdf5b5
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Feb 3 17:21:54 2021 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Feb 4 15:12:02 2021 +0100

    Resize IconView entry if there is no space
    
    If IconView has only one row and there is no space for
    default 100px height - scale down the entries.
    
    Change-Id: I8b310f1274ba91872af0849e36e3a87e775c98b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110381
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index 7786a6976c2a..44fc3db789d4 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -104,6 +104,10 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, tools::Long nX, tools::Long n
     const Color aHighlightTextColor(rSettings.GetHighlightTextColor());
     aHighlightFont.SetColor(aHighlightTextColor);
 
+    Size aOutputSize = GetOutputSizePixel();
+    if (aOutputSize.getHeight() < nTempEntryHeight)
+        nTempEntryHeight = aOutputSize.getHeight();
+
     Size aRectSize(nTempEntryWidth, nTempEntryHeight);
 
     SvViewDataEntry* pViewDataEntry = GetViewDataEntry(&rEntry);


More information about the Libreoffice-commits mailing list