From 42f4182f1d2a7436fbab1c05c7a6d4f81096c129 Mon Sep 17 00:00:00 2001 From: Zero Fanker Date: Fri, 7 Jun 2024 21:17:25 -0400 Subject: [PATCH] #29, fixed trigger editor incorrect KILL_FOCUS handling . --- MissionEditor/TriggerActionsDlg.cpp | 4 +-- MissionEditor/TriggerEditorDlg.cpp | 2 +- MissionEditor/TriggerEventsDlg.cpp | 4 +-- MissionEditor/TriggerOptionsDlg.cpp | 8 +++--- MissionEditor/Triggers.cpp | 38 ++++++++++++++--------------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/MissionEditor/TriggerActionsDlg.cpp b/MissionEditor/TriggerActionsDlg.cpp index a2b95e0..281f111 100644 --- a/MissionEditor/TriggerActionsDlg.cpp +++ b/MissionEditor/TriggerActionsDlg.cpp @@ -79,9 +79,9 @@ void CTriggerActionsDlg::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CTriggerActionsDlg, CDialog) //{{AFX_MSG_MAP(CTriggerActionsDlg) ON_CBN_SELCHANGE(IDC_ACTION, OnSelchangeAction) - ON_CBN_KILLFOCUS(IDC_ACTIONTYPE, OnEditchangeActiontype) + ON_CBN_EDITCHANGE(IDC_ACTIONTYPE, OnEditchangeActiontype) ON_LBN_SELCHANGE(IDC_PARAMETER, OnSelchangeParameter) - ON_CBN_KILLFOCUS(IDC_PARAMVALUE, OnEditchangeParamvalue) + ON_CBN_EDITCHANGE(IDC_PARAMVALUE, OnEditchangeParamvalue) ON_BN_CLICKED(IDC_NEWACTION, OnNewaction) ON_BN_CLICKED(IDC_DELETEACTION, OnDeleteaction) //}}AFX_MSG_MAP diff --git a/MissionEditor/TriggerEditorDlg.cpp b/MissionEditor/TriggerEditorDlg.cpp index 185832b..5007970 100644 --- a/MissionEditor/TriggerEditorDlg.cpp +++ b/MissionEditor/TriggerEditorDlg.cpp @@ -65,7 +65,7 @@ BEGIN_MESSAGE_MAP(CTriggerEditorDlg, CDialog) ON_BN_CLICKED(IDC_NEWTRIGGER, OnNewtrigger) ON_BN_CLICKED(IDC_DELETETRIGGER, OnDeletetrigger) ON_CBN_SELCHANGE(IDC_TRIGGER, OnSelchangeTrigger) - ON_CBN_KILLFOCUS(IDC_TRIGGER, OnEditchangeTrigger) + ON_CBN_EDITCHANGE(IDC_TRIGGER, OnEditchangeTrigger) ON_NOTIFY(TCN_SELCHANGE, IDC_TRIGGERTAB, OnSelchangeTriggertab) ON_BN_CLICKED(IDC_PLACEONMAP, OnPlaceonmap) ON_BN_CLICKED(IDC_CLONE, OnClone) diff --git a/MissionEditor/TriggerEventsDlg.cpp b/MissionEditor/TriggerEventsDlg.cpp index e4ee55b..b31d864 100644 --- a/MissionEditor/TriggerEventsDlg.cpp +++ b/MissionEditor/TriggerEventsDlg.cpp @@ -66,9 +66,9 @@ BEGIN_MESSAGE_MAP(CTriggerEventsDlg, CDialog) ON_BN_CLICKED(IDC_NEWEVENT, OnNewevent) ON_BN_CLICKED(IDC_DELETEEVENT, OnDeleteevent) ON_CBN_SELCHANGE(IDC_EVENT, OnSelchangeEvent) - ON_CBN_KILLFOCUS(IDC_EVENTTYPE, OnEditchangeEventtype) + ON_CBN_EDITCHANGE(IDC_EVENTTYPE, OnEditchangeEventtype) ON_LBN_SELCHANGE(IDC_PARAMETER, OnSelchangeParameter) - ON_CBN_KILLFOCUS(IDC_PARAMVALUE, OnEditchangeParamvalue) + ON_CBN_EDITCHANGE(IDC_PARAMVALUE, OnEditchangeParamvalue) //}}AFX_MSG_MAP END_MESSAGE_MAP() diff --git a/MissionEditor/TriggerOptionsDlg.cpp b/MissionEditor/TriggerOptionsDlg.cpp index a25631a..5003d6b 100644 --- a/MissionEditor/TriggerOptionsDlg.cpp +++ b/MissionEditor/TriggerOptionsDlg.cpp @@ -65,12 +65,11 @@ void CTriggerOptionsDlg::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CTriggerOptionsDlg, CDialog) //{{AFX_MSG_MAP(CTriggerOptionsDlg) + ON_CBN_EDITCHANGE(IDC_HOUSE, OnEditchangeHouse) + ON_CBN_EDITCHANGE(IDC_ATTACHEDTRIGGER, OnEditchangeAttachedtrigger) ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) - ON_CBN_KILLFOCUS(IDC_HOUSE, OnEditchangeHouse) - ON_CBN_KILLFOCUS(IDC_ATTACHEDTRIGGER, OnEditchangeAttachedtrigger) - ON_EN_KILLFOCUS(IDC_NAME, OnKillfocusName) ON_WM_KILLFOCUS() - ON_CBN_KILLFOCUS(IDC_TRIGGERTYPE, OnEditchangeTriggertype) + ON_CBN_EDITCHANGE(IDC_TRIGGERTYPE, OnEditchangeTriggertype) ON_BN_CLICKED(IDC_DISABLED, OnDisabled) ON_BN_CLICKED(IDC_EASY, OnEasy) ON_BN_CLICKED(IDC_MEDIUM, OnMedium) @@ -174,6 +173,7 @@ void CTriggerOptionsDlg::OnChangeName() if (RepairTrigger(triggerCopy)) { ini.SetString("Triggers", m_currentTrigger, triggerCopy); } + OnKillfocusName(); } void CTriggerOptionsDlg::OnEditchangeHouse() diff --git a/MissionEditor/Triggers.cpp b/MissionEditor/Triggers.cpp index a202f65..db7eeff 100644 --- a/MissionEditor/Triggers.cpp +++ b/MissionEditor/Triggers.cpp @@ -114,37 +114,37 @@ BEGIN_MESSAGE_MAP(CTriggers, CDialog) ON_CBN_SELCHANGE(IDC_TRIGGER, OnSelchangeTrigger) ON_CBN_SELCHANGE(IDC_EVENT, OnSelchangeEvent) ON_CBN_SELCHANGE(IDC_ACTION, OnSelchangeAction) - ON_CBN_KILLFOCUS(IDC_HOUSE, OnEditchangeHouse) + ON_CBN_EDITCHANGE(IDC_HOUSE, OnEditchangeHouse) ON_CBN_SELCHANGE(IDC_HOUSE, OnSelchangeHouse) - ON_EN_KILLFOCUS(IDC_NAME, OnChangeName) - ON_EN_KILLFOCUS(IDC_FLAG1, OnChangeFlag1) - ON_EN_KILLFOCUS(IDC_FLAG2, OnChangeFlag2) - ON_EN_KILLFOCUS(IDC_FLAG3, OnChangeFlag3) - ON_EN_KILLFOCUS(IDC_FLAG4, OnChangeFlag4) - ON_EN_KILLFOCUS(IDC_FLAG5, OnChangeFlag5) - ON_CBN_KILLFOCUS(IDC_TRIGGER2, OnEditchangeTrigger2) + ON_CBN_KILLFOCUS(IDC_NAME, OnChangeName) + ON_EN_CHANGE(IDC_FLAG1, OnChangeFlag1) + ON_EN_CHANGE(IDC_FLAG2, OnChangeFlag2) + ON_EN_CHANGE(IDC_FLAG3, OnChangeFlag3) + ON_EN_CHANGE(IDC_FLAG4, OnChangeFlag4) + ON_EN_CHANGE(IDC_FLAG5, OnChangeFlag5) + ON_CBN_EDITCHANGE(IDC_TRIGGER2, OnEditchangeTrigger2) ON_CBN_SELCHANGE(IDC_TRIGGER2, OnSelchangeTrigger2) - ON_CBN_KILLFOCUS(IDC_EVENTTYPE, OnEditchangeEventtype) + ON_CBN_EDITCHANGE(IDC_EVENTTYPE, OnEditchangeEventtype) ON_CBN_SELCHANGE(IDC_EVENTTYPE, OnSelchangeEventtype) - ON_CBN_KILLFOCUS(IDC_EVENTPARAM1, OnEditchangeEventparam1) + ON_CBN_EDITCHANGE(IDC_EVENTPARAM1, OnEditchangeEventparam1) ON_CBN_SELCHANGE(IDC_EVENTPARAM1, OnSelchangeEventparam1) - ON_CBN_KILLFOCUS(IDC_EVENTPARAM2, OnEditchangeEventparam2) + ON_CBN_EDITCHANGE(IDC_EVENTPARAM2, OnEditchangeEventparam2) ON_CBN_SELCHANGE(IDC_EVENTPARAM2, OnSelchangeEventparam2) - ON_CBN_KILLFOCUS(IDC_ACTIONTYPE, OnEditchangeActiontype) + ON_CBN_EDITCHANGE(IDC_ACTIONTYPE, OnEditchangeActiontype) ON_CBN_SELCHANGE(IDC_ACTIONTYPE, OnSelchangeActiontype) - ON_CBN_KILLFOCUS(IDC_ACTIONWAYPOINT, OnEditchangeActionwaypoint) + ON_CBN_EDITCHANGE(IDC_ACTIONWAYPOINT, OnEditchangeActionwaypoint) ON_CBN_SELCHANGE(IDC_ACTIONWAYPOINT, OnSelchangeActionwaypoint) - ON_CBN_KILLFOCUS(IDC_ACTIONPARAM1, OnEditchangeActionparam1) + ON_CBN_EDITCHANGE(IDC_ACTIONPARAM1, OnEditchangeActionparam1) ON_CBN_SELCHANGE(IDC_ACTIONPARAM1, OnSelchangeActionparam1) - ON_CBN_KILLFOCUS(IDC_ACTIONPARAM2, OnEditchangeActionparam2) + ON_CBN_EDITCHANGE(IDC_ACTIONPARAM2, OnEditchangeActionparam2) ON_CBN_SELCHANGE(IDC_ACTIONPARAM2, OnSelchangeActionparam2) - ON_CBN_KILLFOCUS(IDC_ACTIONPARAM3, OnEditchangeActionparam3) + ON_CBN_EDITCHANGE(IDC_ACTIONPARAM3, OnEditchangeActionparam3) ON_CBN_SELCHANGE(IDC_ACTIONPARAM3, OnSelchangeActionparam3) - ON_CBN_KILLFOCUS(IDC_ACTIONPARAM4, OnEditchangeActionparam4) + ON_CBN_EDITCHANGE(IDC_ACTIONPARAM4, OnEditchangeActionparam4) ON_CBN_SELCHANGE(IDC_ACTIONPARAM4, OnSelchangeActionparam4) - ON_CBN_KILLFOCUS(IDC_ACTIONPARAM5, OnEditchangeActionparam5) + ON_CBN_EDITCHANGE(IDC_ACTIONPARAM5, OnEditchangeActionparam5) ON_CBN_SELCHANGE(IDC_ACTIONPARAM5, OnSelchangeActionparam5) - ON_CBN_KILLFOCUS(IDC_ACTIONPARAM6, OnEditchangeActionparam6) + ON_CBN_EDITCHANGE(IDC_ACTIONPARAM6, OnEditchangeActionparam6) ON_CBN_SELCHANGE(IDC_ACTIONPARAM6, OnSelchangeActionparam6) ON_BN_CLICKED(IDC_ADDEVENT, OnAddevent) ON_BN_CLICKED(IDC_DELETEEVENT, OnDeleteevent)