From 7596eecf0ab2b4ea58a72cb21d73748967ac2b22 Mon Sep 17 00:00:00 2001 From: Vadim Yegorov Date: Sat, 30 Sep 2017 21:16:41 +0000 Subject: [PATCH] =?UTF-8?q?1.=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D1=87=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BF=D0=BE=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20DN?= =?UTF-8?q?=5FCONTROLINPUT=20=D1=81=20Param1=3D-1=20=D0=BD=D0=B0=20=D0=BB?= =?UTF-8?q?=D1=8E=D0=B1=D0=BE=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B2?= =?UTF-8?q?=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D1=8B=D1=88=D0=B8?= =?UTF-8?q?,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=B2=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B2=D1=8B=D0=B9=20=D1=80=D0=B0=D0=B7=20=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=BD=D1=83=D0=BB=D0=B8=20TRUE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- far/changelog | 4 ++++ far/dialog.cpp | 5 +++++ far/vbuild.m4 | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/far/changelog b/far/changelog index 385ab84e97..eb72891522 100644 --- a/far/changelog +++ b/far/changelog @@ -1,3 +1,7 @@ +zg 01.10.2017 00:05:03 +0300 - build 5053 + +1. ошибочная посылка DN_CONTROLINPUT с Param1=-1 на любое передвижение мыши, если в первый раз вернули TRUE. + zg 30.09.2017 23:33:20 +0300 - build 5052 1. уточнение 5050.1: lua: Keys"F7 Tab" Dlg.SetFocus(3) win.Sleep(200) Keys"Esc" diff --git a/far/dialog.cpp b/far/dialog.cpp index a7abe42497..ccef95aa1b 100644 --- a/far/dialog.cpp +++ b/far/dialog.cpp @@ -3238,6 +3238,11 @@ bool Dialog::ProcessMouse(const MOUSE_EVENT_RECORD *MouseEvent) else if (!(mouse.Event.MouseEvent.dwButtonState & RIGHTMOST_BUTTON_PRESSED) && (IntKeyState.PrevMouseButtonState&RIGHTMOST_BUTTON_PRESSED) && (Global->Opt->Dialogs.MouseButton&DMOUSEBUTTON_RIGHT)) ProcessKey(Manager::Key(KEY_ENTER)); } + else if (DialogMode.Check(DMODE_CLICKOUTSIDE)) + { + DialogMode.Clear(DMODE_CLICKOUTSIDE); + return true; + } if (mouse.Event.MouseEvent.dwButtonState) DialogMode.Set(DMODE_CLICKOUTSIDE); diff --git a/far/vbuild.m4 b/far/vbuild.m4 index 382811b05d..1b219aad57 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -m4_define(BUILD,5052)m4_dnl +m4_define(BUILD,5053)m4_dnl