Skip to content

Commit 8f1a696

Browse files
committed
Fix search results overlapping (#1648)
Changes in be8568 commit caused that under certain circumstances search results may overlap "Search the Internet" item.
1 parent 4047d72 commit 8f1a696

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Src/StartMenu/StartMenuDLL/MenuContainer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2769,8 +2769,8 @@ bool CMenuContainer::InitSearchItems( void )
27692769
itemHeight=s_Skin.ItemSettings[MenuSkin::LIST_ITEM].itemHeight;
27702770
// total height minus the search box and the "more results"/"search internet", if present
27712771
maxHeight=m_Items[m_SearchIndex].itemRect.top-s_Skin.Main_search_padding.top-s_Skin.Search_padding.top;
2772-
maxHeight-=itemHeight*(m_SearchItemCount-(s_bMoreResults?1:2));
2773-
if (!s_SearchResults.bSearching && !HasMoreResults())
2772+
maxHeight-=itemHeight*(m_SearchItemCount-1);
2773+
if (!s_bMoreResults || (!s_SearchResults.bSearching && !HasMoreResults()))
27742774
maxHeight+=itemHeight;
27752775
}
27762776
if (bAutoComlpete)
@@ -2983,7 +2983,7 @@ bool CMenuContainer::InitSearchItems( void )
29832983
else
29842984
{
29852985
m_ScrollCount=(int)m_Items.size();
2986-
bool bInternet=GetSettingBool(L"SearchInternet");
2986+
bool bInternet=GetSettingBool(L"SearchInternet");
29872987
if (s_bMoreResults && s_SearchResults.bSearching)
29882988
{
29892989
MenuItem item(MENU_SEARCH_EMPTY);

0 commit comments

Comments
 (0)