Skip to content

Commit

Permalink
1. уточнение 5050.1: macro Align Block Special is broken.
Browse files Browse the repository at this point in the history
  • Loading branch information
zg0 committed Oct 15, 2017
1 parent c4b09af commit 5f90827
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
4 changes: 4 additions & 0 deletions far/changelog
@@ -1,3 +1,7 @@
zg 15.10.2017 16:22:28 +0300 - build 5065

1. уточнение 5050.1: macro Align Block Special is broken.

drkns 11.10.2017 22:04:47 +0100 - build 5064

1. В 5049 погнулось повышение привилегий при создании папки.
Expand Down
24 changes: 12 additions & 12 deletions far/dialog.cpp
Expand Up @@ -4497,10 +4497,15 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
_DIALOG(CleverSysLog CL(L"Dialog.SendDlgMessage()"));
_DIALOG(SysLog(L"hDlg=%p, Msg=%s, Param1=%d (0x%08X), Param2=%d (0x%08X)",this,_DLGMSG_ToName(Msg),Param1,Param1,Param2,Param2));

const auto redraw=[this]
const auto redraw=[this](bool Flush)
{
Global->WindowManager->RefreshWindow(shared_from_this());
Global->WindowManager->PluginCommit();
if (DialogMode.Check(DMODE_OBJECTS_INITED) && !DialogMode.Check(DMODE_DRAWING) && IsRedrawEnabled())
{
Global->WindowManager->RefreshWindow(shared_from_this());
Global->WindowManager->PluginCommit();
if (Flush)
Global->ScrBuf->Flush();
}
};
// Сообщения, касаемые только диалога и не затрагивающие элементы
switch (Msg)
Expand Down Expand Up @@ -4626,12 +4631,7 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
/*****************************************************************/
case DM_REDRAW:
{
if (DialogMode.Check(DMODE_OBJECTS_INITED) && IsRedrawEnabled())
{
redraw();
if (!DialogMode.Check(DMODE_DRAWING))
Global->ScrBuf->Flush();
}
redraw(true);
return 0;
}
/*****************************************************************/
Expand Down Expand Up @@ -5191,7 +5191,7 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
EditPtr->SetCurPos(((COORD*)Param2)->X);
//EditPtr->Show();
EditPtr->SetClearFlag(false);
redraw();
redraw(false);
return TRUE;
}
else if (Type == DI_USERCONTROL && CurItem->UCData)
Expand All @@ -5218,7 +5218,7 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
{
// что-то одно надо убрать :-)
MoveCursor(Coord.X+m_X1,Coord.Y+m_Y1); // ???
redraw(); //???
redraw(false); //???
}

return TRUE;
Expand Down Expand Up @@ -5497,7 +5497,7 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
if (DialogMode.Check(DMODE_DRAWING))
DialogMode.Set(DMODE_NEEDUPDATE);
else
redraw();
redraw(false);
return TRUE;
}

Expand Down
2 changes: 1 addition & 1 deletion far/vbuild.m4
@@ -1 +1 @@
m4_define(BUILD,5064)m4_dnl
m4_define(BUILD,5065)m4_dnl

0 comments on commit 5f90827

Please sign in to comment.