diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-23 23:26:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 23:26:54 +0300 |
| commit | 38916ebf367aa400d8151d78204e714d40e8c323 (patch) | |
| tree | 2fe671253d83620fba0e0b1c6c488997b558a7ef /indra/llui/llfolderview.cpp | |
| parent | 4274eb591a1b0806f8c73ca16df65ade60db2200 (diff) | |
| parent | 0b7548c6b69f8259aae987c479a85a9d0fd04d89 (diff) | |
Merge pull request #2657 from secondlife/marchcat/b-develop
develop → Maint B sync
Diffstat (limited to 'indra/llui/llfolderview.cpp')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 388dc5b1ac..42a9e267d2 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -1649,7 +1649,7 @@ void LLFolderView::scrollToShowItem(LLFolderViewItem* item, const LLRect& constr { LLRect local_rect = item->getLocalRect(); S32 icon_height = mIcon.isNull() ? 0 : mIcon->getHeight(); - S32 label_height = getLabelFontForStyle(mLabelStyle)->getLineHeight(); + S32 label_height = getLabelFont()->getLineHeight(); // when navigating with keyboard, only move top of opened folder on screen, otherwise show whole folder S32 max_height_to_show = item->isOpen() && mScrollContainer->hasFocus() ? (llmax( icon_height, label_height ) + item->getIconPad()) : local_rect.getHeight(); |