From c8693efe1eeed1c6293c3b4b68b1a83d58e8d43e Mon Sep 17 00:00:00 2001 From: commy2 Date: Wed, 21 Nov 2018 00:52:24 +0100 Subject: [PATCH] use custom OK button to fix ui bug --- addons/settings/fnc_initDisplayGameOptions.sqf | 5 +---- addons/settings/fnc_openSettingsMenu.sqf | 10 ++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/settings/fnc_initDisplayGameOptions.sqf b/addons/settings/fnc_initDisplayGameOptions.sqf index b49f99fdf..3cc712ab0 100644 --- a/addons/settings/fnc_initDisplayGameOptions.sqf +++ b/addons/settings/fnc_initDisplayGameOptions.sqf @@ -176,7 +176,4 @@ _ctrlButtonExport ctrlAddEventHandler ["ButtonClick", { (_display displayCtrl IDC_BTN_CONFIGURE_ADDONS) ctrlAddEventHandler ["ButtonClick", {_this call FUNC(gui_configure)}]; // ----- scripted OK button -(_display displayCtrl 999) ctrlAddEventHandler ["ButtonClick", { - call FUNC(gui_saveTempData); - ctrlParent (_this select 0) closeDisplay IDC_OK; -}]; +(_display displayCtrl 999) ctrlAddEventHandler ["ButtonClick", {call FUNC(gui_saveTempData)}]; diff --git a/addons/settings/fnc_openSettingsMenu.sqf b/addons/settings/fnc_openSettingsMenu.sqf index c0efdd082..f250149c9 100644 --- a/addons/settings/fnc_openSettingsMenu.sqf +++ b/addons/settings/fnc_openSettingsMenu.sqf @@ -17,6 +17,16 @@ _ctrlConfigureAddons call FUNC(gui_configure); _ctrlConfigureAddons ctrlEnable false; _ctrlConfigureAddons ctrlShow false; +// replace BI's broken OK button with our own to fix https://github.com/CBATeam/CBA_A3/issues/1027 +private _ctrlScriptedOK = _dlgSettings displayCtrl 999; +_ctrlScriptedOK ctrlEnable false; +_ctrlScriptedOK ctrlShow false; + +private _ctrlConfirm = _dlgSettings ctrlCreate ["RscButtonMenuOK", IDC_CANCEL]; +_ctrlConfirm ctrlSetPosition ctrlPosition _ctrlScriptedOK; +_ctrlConfirm ctrlCommit 0; +_ctrlConfirm ctrlAddEventHandler ["ButtonClick", {call FUNC(gui_saveTempData)}]; + // then switch right to missions tab if in 3den if (ctrlIDD _display isEqualTo 313) then { private _ctrlMissionButton = _dlgSettings displayCtrl IDC_BTN_MISSION;