Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[PowerRename][ImageResizer]Fallback for tier 1 menus (#19195)

Browse Source 
* [PowerRename][ImageResizer]fallback for tier 1 menus

* Simplify logic
This commit is contained in:
Jaime Bernardo
2022-07-07 15:56:14 +01:00
committed by GitHub
parent d4b62d8118
commit e887b3b395
6 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/imageresizer/ImageResizerLib/ImageResizerConstants.h
View File

@@ -9,4 +9,5 @@ namespace ImageResizerConstants
// Name of the ImageResizer save folder.
inline const std::wstring ModuleOldSaveFolderKey = L"ImageResizer";
inline const std::wstring ModuleSaveFolderKey = L"Image Resizer";
inline const std::wstring ModulePackageDisplayName = L"ImageResizerContextMenu";
}

15
src/modules/imageresizer/dll/ContextMenuHandler.cpp
View File

@@ -2,6 +2,7 @@
#include "pch.h"
#include "ContextMenuHandler.h"
#include <ImageResizerConstants.h>
#include <Settings.h>
#include <trace.h>
@@ -63,17 +64,15 @@ HRESULT CContextMenuHandler::Initialize(_In_opt_ PCIDLIST_ABSOLUTE pidlFolder, _
HRESULT CContextMenuHandler::QueryContextMenu(_In_ HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
{
if (package::IsWin11OrGreater())
if (uFlags & CMF_DEFAULTONLY)
return S_OK;
if (!CSettingsInstance().GetEnabled())
return E_FAIL;
if (uFlags & CMF_DEFAULTONLY)
{
return S_OK;
}
if (!CSettingsInstance().GetEnabled())
{
if (package::IsWin11OrGreater() && package::IsPackageRegistered(ImageResizerConstants::ModulePackageDisplayName))
return E_FAIL;
}
// NB: We just check the first item. We could iterate through more if the first one doesn't meet the criteria
HDropIterator i(m_pdtobj);
i.First();

3
src/modules/imageresizer/dll/dllmain.cpp
View File

@@ -102,8 +102,7 @@ public:
std::wstring path = get_module_folderpath(g_hInst_imageResizer);
std::wstring packageUri = path + L"\\ImageResizerContextMenuPackage.msix";
std::wstring packageDisplayName{ L"ImageResizerContextMenu" };
if (!package::IsPackageRegistered(packageDisplayName))
if (!package::IsPackageRegistered(ImageResizerConstants::ModulePackageDisplayName))
{
package::RegisterSparsePackage(path, packageUri);
}

1
src/modules/powerrename/dll/PowerRenameConstants.h
View File

@@ -5,4 +5,5 @@ namespace PowerRenameConstants
{
// Name of the powertoy module.
inline const std::wstring ModuleKey = L"PowerRename";
inline const std::wstring ModulePackageDisplayName = L"PowerRenameContextMenu";
}

27
src/modules/powerrename/dll/PowerRenameExt.cpp
View File

@@ -1,5 +1,6 @@
#include "pch.h"
#include "PowerRenameExt.h"
#include "PowerRenameConstants.h"
#include <trace.h>
#include <Helpers.h>
#include <common/themes/icon_helpers.h>
@@ -64,29 +65,17 @@ HRESULT CPowerRenameMenu::QueryContextMenu(HMENU hMenu, UINT index, UINT uIDFirs
if (!CSettingsInstance().GetEnabled())
return E_FAIL;
// Win11 context menu can't distinguish between extended and default menu, so use this one
if (package::IsWin11OrGreater())
{
if (CSettingsInstance().GetExtendedContextMenuOnly() && (uFlags & CMF_EXTENDEDVERBS))
{
// continue
}
else
{
return E_FAIL;
}
}
else
{
// Check if we should only be on the extended context menu
if (CSettingsInstance().GetExtendedContextMenuOnly() && (!(uFlags & CMF_EXTENDEDVERBS)))
return E_FAIL;
}
// Check if at least one of the selected items is actually renamable.
if (!DataObjectContainsRenamableItem(m_spdo))
return E_FAIL;
if (package::IsWin11OrGreater() && package::IsPackageRegistered(PowerRenameConstants::ModulePackageDisplayName))
return E_FAIL;
// Check if we should only be on the extended context menu
if (CSettingsInstance().GetExtendedContextMenuOnly() && (!(uFlags & CMF_EXTENDEDVERBS)))
return E_FAIL;
HRESULT hr = E_UNEXPECTED;
if (m_spdo && !(uFlags & (CMF_DEFAULTONLY | CMF_VERBSONLY | CMF_OPTIMIZEFORINVOKE)))
{

3
src/modules/powerrename/dll/dllmain.cpp
View File

@@ -193,8 +193,7 @@ public:
std::wstring path = get_module_folderpath(g_hInst);
std::wstring packageUri = path + L"\\PowerRenameContextMenuPackage.msix";
std::wstring packageDisplayName{ L"PowerRenameContextMenu" };
if (!package::IsPackageRegistered(packageDisplayName))
if (!package::IsPackageRegistered(PowerRenameConstants::ModulePackageDisplayName))
{
package::RegisterSparsePackage(path, packageUri);
}