From 653e64b1ed3b54a5f17ed7455e62f62bd42627a8 Mon Sep 17 00:00:00 2001
From: Alex Alabuzhev <alabuzhev@gmail.com>
Date: Thu, 17 Aug 2017 21:36:18 +0000
Subject: [PATCH] taskbar redraw fix, search dlg redraw fix

---
 far/changelog      |  6 ++++++
 far/filepanels.cpp | 17 +++++++++++++++++
 far/findfile.cpp   | 12 ++++--------
 far/vbuild.m4      |  2 +-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/far/changelog b/far/changelog
index 6370cd0b15..376a828bf5 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,9 @@
+drkns 17.08.2017 22:31:49 +0000 - build 5010
+
+1. С форума: не обновляется строка горячих клавиш после просмотра сети.
+
+2. С форума: в диалоге поиска некорректно перерисовывался разделитель при изменении размера.
+
 drkns 16.08.2017 11:43:28 +0000 - build 5009
 
 1. Уточнение 5008.
diff --git a/far/filepanels.cpp b/far/filepanels.cpp
index 08dc363cc0..60f62c6869 100644
--- a/far/filepanels.cpp
+++ b/far/filepanels.cpp
@@ -640,6 +640,20 @@ bool FilePanels::ProcessKey(const Manager::Key& Key)
 			if (!IsLeftActive())
 				ActivePanel()->SetCurPath();
 
+			/*
+			It's not the best place to update the keybar.
+			Usually it's called from PopPlugin with EnableRestoreViewMode = true (and works),
+			but in this case PopPlugin is called from ~FileList with EnableRestoreViewMode = false,
+			which is kinda makes sense in general (e. g. exiting), except that ChangeDisk
+			causes FileList destruction as well.
+
+			It shall be consistent for all ways of closing plugin panel - "..", Disk menu, "cd c:" etc.
+
+			Same for KEY_ALTF2 below.
+			 */
+			if (IsLeftActive())
+				LeftPanel()->UpdateKeyBar();
+
 			break;
 		}
 		case KEY_ALTF2:
@@ -650,6 +664,9 @@ bool FilePanels::ProcessKey(const Manager::Key& Key)
 			if (!IsRightActive())
 				ActivePanel()->SetCurPath();
 
+			if (IsRightActive())
+				RightPanel()->UpdateKeyBar();
+
 			break;
 		}
 		case KEY_ALTF7:
diff --git a/far/findfile.cpp b/far/findfile.cpp
index eab55b961c..32f25d5e8c 100644
--- a/far/findfile.cpp
+++ b/far/findfile.cpp
@@ -1448,14 +1448,6 @@ intptr_t FindFiles::FindDlgProc(Dialog* Dlg, intptr_t Msg, intptr_t Param1, void
 				}
 				break;
 
-			case KEY_ALTF9:
-			case KEY_RALTF9:
-			case KEY_F11:
-			case KEY_CTRLW:
-			case KEY_RCTRLW:
-				Global->WindowManager->ProcessKey(Manager::Key(key));
-				return TRUE;
-
 			case KEY_RIGHT:
 			case KEY_NUMPAD6:
 			case KEY_TAB:
@@ -1748,6 +1740,10 @@ intptr_t FindFiles::FindDlgProc(Dialog* Dlg, intptr_t Msg, intptr_t Param1, void
 				SMALL_RECT rect;
 				Dlg->SendMessage( DM_GETITEMPOSITION, i, &rect);
 
+				if (i == FD_SEPARATOR1)
+				{
+					rect.Left = rect.Right = -1;
+				}
 				if (i == FD_TEXT_STATUS)
 				{
 					rect.Right += IncX;
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index dad97ed686..df742844fc 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,5009)m4_dnl
+m4_define(BUILD,5010)m4_dnl