From 61a9a3a698a43062fbe6cbee63dc5ff5d10bceb7 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sun, 14 Aug 2016 22:09:07 +0200
Subject: [PATCH] Allow to clear filters with escape

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseProc/BrowseRefsDlg.cpp     | 7 +++++++
 src/TortoiseProc/CommitIsOnRefsDlg.cpp | 8 ++++++++
 src/TortoiseProc/FileDiffDlg.cpp       | 8 ++++++++
 src/TortoiseProc/LogDlg.cpp            | 7 +++++++
 4 files changed, 30 insertions(+)

diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp
index e73e4e1ee..9cffecbe3 100644
--- a/src/TortoiseProc/BrowseRefsDlg.cpp
+++ b/src/TortoiseProc/BrowseRefsDlg.cpp
@@ -1325,6 +1325,13 @@ BOOL CBrowseRefsDlg::PreTranslateMessage(MSG* pMsg)
 				}
 			}
 			break;
+		case VK_ESCAPE:
+			if (GetFocus() == GetDlgItem(IDC_BROWSEREFS_EDIT_FILTER) && m_ctrlFilter.GetWindowTextLength())
+			{
+				OnClickedCancelFilter(NULL, NULL);
+				return TRUE;
+			}
+			break;
 		}
 	}
 
diff --git a/src/TortoiseProc/CommitIsOnRefsDlg.cpp b/src/TortoiseProc/CommitIsOnRefsDlg.cpp
index d19f7ef4f..32b10ddc4 100644
--- a/src/TortoiseProc/CommitIsOnRefsDlg.cpp
+++ b/src/TortoiseProc/CommitIsOnRefsDlg.cpp
@@ -526,6 +526,14 @@ BOOL CCommitIsOnRefsDlg::PreTranslateMessage(MSG* pMsg)
 			OnTimer(IDT_INPUT);
 		}
 		break;
+		case VK_ESCAPE:
+			if (GetFocus() == GetDlgItem(IDC_FILTER) && m_cFilter.GetWindowTextLength())
+			{
+				m_cFilter.SetWindowText(L"");
+				OnTimer(IDT_FILTER);
+				return TRUE;
+			}
+			break;
 		}
 	}
 	return __super::PreTranslateMessage(pMsg);
diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp
index ca2d4f747..90a8de9d6 100644
--- a/src/TortoiseProc/FileDiffDlg.cpp
+++ b/src/TortoiseProc/FileDiffDlg.cpp
@@ -916,6 +916,14 @@ BOOL CFileDiffDlg::PreTranslateMessage(MSG* pMsg)
 				OnTimer(IDT_INPUT);
 			}
 			break;
+		case VK_ESCAPE:
+			if (GetFocus() == GetDlgItem(IDC_FILTER) && m_cFilter.GetWindowTextLength())
+			{
+				m_cFilter.SetWindowText(L"");
+				OnClickedCancelFilter(NULL, NULL);
+				return TRUE;
+			}
+			break;
 		}
 	}
 	return __super::PreTranslateMessage(pMsg);
diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index 708dc6c68..c8ed6a6e8 100644
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -1693,6 +1693,13 @@ BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
 			return TRUE;
 		}
 	}
+	else if (pMsg->message == WM_KEYDOWN  && pMsg->wParam == VK_ESCAPE && GetFocus() == GetDlgItem(IDC_FILTER) && m_cFileFilter.GetWindowTextLength())
+	{
+		m_cFileFilter.SetWindowText(L"");
+		KillTimer(FILEFILTER_TIMER);
+		FillLogMessageCtrl();
+		return TRUE;
+	}
 	else if (pMsg->message == WM_XBUTTONUP)
 	{
 		bool select = (pMsg->wParam & MK_SHIFT) == 0;
-- 
2.11.4.GIT