mirror of
https://github.com/Open-Shell/Open-Shell-Menu.git
synced 2026-04-12 18:07:24 +10:00
trunk (#20)
* Fix stdafx include * Fix basic handling of "Games" folder on Windows10 RS4 (#10) This does the following: - Sets the default state to hidden - Skips the Games folder when searching This does not: - Hide the dead menu entry. I do not currently know how to actively change the user preference setting to forcefully hide it. * Add basic Visual Studio gitignore * Add specific entries to gitignore * Do not set default menu to Win7 on RS4 (#10) * Rename "PC Settings" to "Settings" (#12) * Create distinction between modern and legacy settings in search results * Add more build artifacts to gitignore * Add default paths for toolset and build all languages * Fix several memsize, memtype and nullpointer issues * create trunk branch containing all changes * set fallback and next version to 4.3.2, set resource fallback value to allow loading in IDE * add generated en-US.dll to gitignore * Don't echo script contents, add disabled "git clean -dfx" to build fresh * fix gitignore to not destroy en-US language project
This commit is contained in:
@@ -240,7 +240,7 @@ static DWORD WINAPI NewShortcutThread( void *param )
|
||||
|
||||
static DWORD WINAPI SleepThread( void *param )
|
||||
{
|
||||
SetSuspendState((BOOL)(intptr_t)param,FALSE,FALSE);
|
||||
SetSuspendState((intptr_t)param != 0,FALSE,FALSE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -469,9 +469,9 @@ void CMenuContainer::OpenSubMenu( int index, TActivateType type, bool bShift )
|
||||
pMenu->Create(parent,NULL,s_SubmenuStyle,WS_EX_TOOLWINDOW|WS_EX_TOPMOST|(s_bRTL?WS_EX_LAYOUTRTL:0));
|
||||
|
||||
if (GetSettingBool(L"MenuShadow") && s_Skin.Submenu_shadow==MenuSkin::SHADOW_ON)
|
||||
SetClassLong(pMenu->m_hWnd,GCL_STYLE,GetClassLong(pMenu->m_hWnd,GCL_STYLE)|CS_DROPSHADOW);
|
||||
SetClassLongPtr(pMenu->m_hWnd,GCL_STYLE,GetClassLongPtr(pMenu->m_hWnd,GCL_STYLE)|CS_DROPSHADOW);
|
||||
else
|
||||
SetClassLong(pMenu->m_hWnd,GCL_STYLE,GetClassLong(pMenu->m_hWnd,GCL_STYLE)&~CS_DROPSHADOW);
|
||||
SetClassLongPtr(pMenu->m_hWnd,GCL_STYLE,GetClassLongPtr(pMenu->m_hWnd,GCL_STYLE)&~CS_DROPSHADOW);
|
||||
|
||||
if (!parent && s_TaskBar)
|
||||
{
|
||||
@@ -2245,7 +2245,7 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
|
||||
|
||||
if (res==CMD_SORT)
|
||||
{
|
||||
if (pData && pData->bProgramsTree)
|
||||
if (pData && pData->bProgramsTree && m_pProgramsTree)
|
||||
{
|
||||
m_pProgramsTree->OrderElements(pData->hTreeItem,TreeView_GetParent(m_pProgramsTree->m_hWnd,pData->hTreeItem),std::vector<unsigned int>(),false,true);
|
||||
}
|
||||
@@ -2956,16 +2956,16 @@ void CMenuContainer::DragTreeItem( const void *treeItem, bool bApp )
|
||||
item.id=MENU_NO;
|
||||
item.name=pTreeItem->name;
|
||||
item.pItemInfo=pTreeItem->pItemInfo1;
|
||||
item.pItem1=pTreeItem->pItemInfo1->GetPidl();
|
||||
item.pItem2=pTreeItem->pItemInfo2?(PIDLIST_ABSOLUTE)pTreeItem->pItemInfo2->GetPidl():NULL;
|
||||
item.bFolder=pTreeItem->bFolder;
|
||||
item.bMetroLink=false;
|
||||
item.bMetroApp=false;
|
||||
if (pTreeItem->pItemInfo1)
|
||||
if(item.pItemInfo)
|
||||
{
|
||||
item.pItem1=pTreeItem->pItemInfo1->GetPidl();
|
||||
CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS);
|
||||
item.bMetroLink=pTreeItem->pItemInfo1->IsMetroLink();
|
||||
item.bMetroApp=pTreeItem->pItemInfo1->IsMetroApp();
|
||||
item.bMetroLink=item.pItemInfo->IsMetroLink();
|
||||
item.bMetroApp=item.pItemInfo->IsMetroApp();
|
||||
}
|
||||
DragOut(m_ProgramTreeIndex,bApp);
|
||||
item.id=MENU_PROGRAMS_TREE;
|
||||
|
||||
Reference in New Issue
Block a user