浏览代码

UPD: Copy file filter when cloning columns file view.

cobines 15 年之前
父节点
当前提交
5f8056b2c8
共有 1 个文件被更改,包括 14 次插入2 次删除
  1. 14 2
      src/newdesign/ucolumnsfileview.pas

+ 14 - 2
src/newdesign/ucolumnsfileview.pas

@@ -287,6 +287,7 @@ type
     procedure ShowSearchPanel(Char : TUTF8Char = #0);
     procedure CloseSearchPanel;
     procedure ShowFilterPanel(Char : TUTF8Char = #0);
+    procedure FilterPanelVisible;
     procedure CloseFilterPanel;
 
     procedure CalculateSpaceOfAllDirectories;
@@ -1569,6 +1570,12 @@ begin
   SetActive(False);
 end;
 
+procedure TColumnsFileView.FilterPanelVisible;
+begin
+  pnlFilter.Visible := True;
+  edtFilter.Width := pnlFilter.Width div 2;
+end;
+
 procedure TColumnsFileView.CloseFilterPanel;
 begin
   edtFilter.Text := '';      // Automatically triggers edtFilterChange.
@@ -1605,8 +1612,7 @@ procedure TColumnsFileView.ShowFilterPanel(Char : TUTF8Char = #0);
 begin
   frmMain.EnableHotkeys(False);
 
-  pnlFilter.Visible := True;
-  edtFilter.Width  := pnlFilter.Width div 2;
+  FilterPanelVisible;
   edtFilter.SetFocus;
 
   if Char <> #0 then
@@ -2592,6 +2598,12 @@ begin
       fPrevious : Boolean;
       }
 
+      if Self.FileFilter <> '' then
+      begin
+        edtFilter.Text := Self.FileFilter; // will trigger assiging to FileFilter
+        FilterPanelVisible;
+      end;
+
       FSorting := Self.FSorting.Clone;
       FSortColumn := Self.FSortColumn;
       FSortDirection := Self.FSortDirection;