timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-11 17:37:22 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix search results overlapping (#1648)

Browse Source 
Changes in be8568 commit caused that under certain circumstances search
results may overlap "Search the Internet" item.
This commit is contained in:
ge0rdi
2023-08-05 13:24:41 +02:00
parent 4047d726ac
commit 8f1a696e94
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Src/StartMenu/StartMenuDLL/MenuContainer.cpp
View File

@@ -2769,8 +2769,8 @@ bool CMenuContainer::InitSearchItems( void )
itemHeight=s_Skin.ItemSettings[MenuSkin::LIST_ITEM].itemHeight; itemHeight=s_Skin.ItemSettings[MenuSkin::LIST_ITEM].itemHeight;
// total height minus the search box and the "more results"/"search internet", if present // total height minus the search box and the "more results"/"search internet", if present
maxHeight=m_Items[m_SearchIndex].itemRect.top-s_Skin.Main_search_padding.top-s_Skin.Search_padding.top; maxHeight=m_Items[m_SearchIndex].itemRect.top-s_Skin.Main_search_padding.top-s_Skin.Search_padding.top;
maxHeight-=itemHeight*(m_SearchItemCount-(s_bMoreResults?1:2)); maxHeight-=itemHeight*(m_SearchItemCount-1);
if (!s_SearchResults.bSearching && !HasMoreResults()) if (!s_bMoreResults || (!s_SearchResults.bSearching && !HasMoreResults()))
maxHeight+=itemHeight; maxHeight+=itemHeight;
} }
if (bAutoComlpete) if (bAutoComlpete)
@@ -2983,7 +2983,7 @@ bool CMenuContainer::InitSearchItems( void )
else else
{ {
m_ScrollCount=(int)m_Items.size(); m_ScrollCount=(int)m_Items.size();
bool bInternet=GetSettingBool(L"SearchInternet"); bool bInternet=GetSettingBool(L"SearchInternet");
if (s_bMoreResults && s_SearchResults.bSearching) if (s_bMoreResults && s_SearchResults.bSearching)
{ {
MenuItem item(MENU_SEARCH_EMPTY); MenuItem item(MENU_SEARCH_EMPTY);