Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This should fix Nai's issue, maybe?

Browse Source
This commit is contained in:
Liru Færs
2019-08-18 16:20:26 -04:00
parent a1a23cf6c5
commit 971083415c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llui/llscrolllistctrl.cpp
View File

@@ -1426,9 +1426,6 @@ void LLScrollListCtrl::drawItems()
S32 x = mItemListRect.mLeft; S32 x = mItemListRect.mLeft;
S32 y = mItemListRect.mTop - mLineHeight; S32 y = mItemListRect.mTop - mLineHeight;
// allow for partial line at bottom
S32 num_page_lines = getLinesPerPage();
LLRect item_rect; LLRect item_rect;
LLGLSUIDefault gls_ui; LLGLSUIDefault gls_ui;
@@ -1453,6 +1450,9 @@ void LLScrollListCtrl::drawItems()
return; return;
} }
S32 list_size = mItemList.size() - 1; S32 list_size = mItemList.size() - 1;
// allow for partial line at bottom
S32 num_page_lines = mFilter.empty() ? getLinesPerPage() : mScrollbar->getDocSize() + 1;
S32 last_line = llmin(list_size, mScrollLines + num_page_lines); S32 last_line = llmin(list_size, mScrollLines + num_page_lines);
S32 max_columns = 0; S32 max_columns = 0;
@@ -2441,8 +2441,7 @@ S32 LLScrollListCtrl::getLinesPerPage()
} }
else else
{ {
return mLineHeight ? mItemListRect.getHeight() / mLineHeight : return mLineHeight ? mItemListRect.getHeight() / mLineHeight : getItemCount();
mFilter.empty() ? getItemCount() : mScrollbar->getDocSize();
} }
} }