Skip to content

Commit

Permalink
taskbar redraw fix, search dlg redraw fix
Browse files Browse the repository at this point in the history
  • Loading branch information
alabuzhev committed Aug 17, 2017
1 parent bb66bb5 commit 653e64b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 9 deletions.
6 changes: 6 additions & 0 deletions 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.
Expand Down
17 changes: 17 additions & 0 deletions far/filepanels.cpp
Expand Up @@ -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:
Expand All @@ -650,6 +664,9 @@ bool FilePanels::ProcessKey(const Manager::Key& Key)
if (!IsRightActive())
ActivePanel()->SetCurPath();

if (IsRightActive())
RightPanel()->UpdateKeyBar();

break;
}
case KEY_ALTF7:
Expand Down
12 changes: 4 additions & 8 deletions far/findfile.cpp
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion far/vbuild.m4
@@ -1 +1 @@
m4_define(BUILD,5009)m4_dnl
m4_define(BUILD,5010)m4_dnl

0 comments on commit 653e64b

Please sign in to comment.