浏览代码

Bug 1742: Incremental search can be disabled using raw configuration setting

https://winscp.net/tracker/1742

Source commit: 3add421a6baec940f1280beebd4c7e12d4996ee0
Martin Prikryl 6 年之前
父节点
当前提交
5dd2833c9a
共有 3 个文件被更改,包括 8 次插入2 次删除
  1. 1 1
      source/forms/CustomScpExplorer.cpp
  2. 6 0
      source/forms/Preferences.cpp
  3. 1 1
      source/windows/CustomWinConfiguration.h

+ 1 - 1
source/forms/CustomScpExplorer.cpp

@@ -10356,7 +10356,7 @@ void __fastcall TCustomScpExplorerForm::DirViewKeyDown(TObject * Sender, WORD &
 void __fastcall TCustomScpExplorerForm::DirViewKeyPress(TObject * Sender, wchar_t & Key)
 {
   TCustomDirView * DirView = dynamic_cast<TCustomDirView *>(Sender);
-  if (!DirView->IsEditing())
+  if (!DirView->IsEditing() && (WinConfiguration->PanelSearch != isOff))
   {
     // Filter control sequences.
     // When not searching yet, prefer use of the space for toggling file selection

+ 6 - 0
source/forms/Preferences.cpp

@@ -502,6 +502,9 @@ void __fastcall TPreferencesDialog::LoadConfiguration()
 
     switch (WinConfiguration->PanelSearch)
     {
+      case isOff:
+        PanelSearchCombo->ItemIndex = -1;
+        break;
       case isNameStartOnly:
         PanelSearchCombo->ItemIndex = 0;
         break;
@@ -876,6 +879,9 @@ void __fastcall TPreferencesDialog::SaveConfiguration()
 
     switch (PanelSearchCombo->ItemIndex)
     {
+      case -1:
+        WinConfiguration->PanelSearch = isOff;
+        break;
       case 0:
         WinConfiguration->PanelSearch = isNameStartOnly;
         break;

+ 1 - 1
source/windows/CustomWinConfiguration.h

@@ -32,7 +32,7 @@ struct TConsoleWinConfiguration
     { return C(WindowSize) 0; };
 };
 //---------------------------------------------------------------------------
-enum TIncrementalSearch { isNameStartOnly, isName, isAll };
+enum TIncrementalSearch { isOff = -1, isNameStartOnly, isName, isAll };
 //---------------------------------------------------------------------------
 struct TLoginDialogConfiguration : public TConsoleWinConfiguration
 {