From d1c76d9d1af71fdf2ca1a169329078d31d466c48 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 30 May 2021 10:45:34 +0900 Subject: [PATCH] =?utf8?q?DirView.cpp:=20Disable=20Compare=20As=20?= =?utf8?q?=E2=86=92=20Text=20~=20XML=20in=20the=20context=20menu=20when=20?= =?utf8?q?the=20selected=20item=20is=20a=20folder=20or=20parent=20folder?= =?utf8?q?=20icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Src/DirView.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Src/DirView.cpp b/Src/DirView.cpp index a4e531248..5b41f2422 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -1895,7 +1895,7 @@ void CDirView::DoUpdateOpen(SELECTIONTYPE selectionType, CCmdUI* pCmdUI, bool op if (!openableForDir) { const DIFFITEM& di1 = GetDiffItem(sel1); - if (di1.diffcode.isDirectory()) + if (di1.diffcode.isDirectory() || GetItemKey(sel1) == reinterpret_cast(SPECIAL_ITEM_POS)) { pCmdUI->Enable(FALSE); return; @@ -3724,9 +3724,8 @@ void CDirView::OnMergeCompareAs(UINT nID) void CDirView::OnUpdateMergeCompare(CCmdUI *pCmdUI) { - bool openableForDir = (pCmdUI->m_nID != ID_MERGE_COMPARE_XML && - pCmdUI->m_nID != ID_MERGE_COMPARE_HEX && - pCmdUI->m_nID != ID_MERGE_COMPARE_IMAGE); + bool openableForDir = !(pCmdUI->m_nID >= ID_MERGE_COMPARE_TEXT && + pCmdUI->m_nID <= ID_MERGE_COMPARE_XML); DoUpdateOpen(SELECTIONTYPE_NORMAL, pCmdUI, openableForDir); } -- 2.11.0