From ab0265aee4e6b6682d021409a061a3c44b1ba318 Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 26 Jul 2019 10:55:36 +0200 Subject: [PATCH 1/2] fix minor ui issues with Contact DLC ui modifications --- addons/settings/fnc_gui_sourceChanged.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/settings/fnc_gui_sourceChanged.sqf b/addons/settings/fnc_gui_sourceChanged.sqf index 7023c32ea..26370c49f 100644 --- a/addons/settings/fnc_gui_sourceChanged.sqf +++ b/addons/settings/fnc_gui_sourceChanged.sqf @@ -26,7 +26,7 @@ private _selectedAddon = uiNamespace getVariable QGVAR(addon); // toggle source buttons { private _ctrlX = _display displayCtrl _x; - _ctrlX ctrlSetTextColor ([COLOR_BUTTON_ENABLED, COLOR_BUTTON_DISABLED] select (_control == _ctrlX)); + _ctrlX ctrlSetTextColor ([COLOR_BUTTON_ENABLED, COLOR_BUTTON_DISABLED] select (_control == _ctrlX && {!isClass (configFile >> "CfgPatches" >> "A3_Data_F_Contact")})); _ctrlX ctrlSetBackgroundColor ([COLOR_BUTTON_DISABLED, COLOR_BUTTON_ENABLED] select (_control == _ctrlX)); } forEach [IDC_BTN_SERVER, IDC_BTN_MISSION, IDC_BTN_CLIENT]; From 8355c32e484004507e84cf3970df0b83c00e0e46 Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 26 Jul 2019 11:18:36 +0200 Subject: [PATCH 2/2] fix another minor ui issue with Contact DLC ui modifications --- addons/ui/fnc_initDisplayInterrupt.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/ui/fnc_initDisplayInterrupt.sqf b/addons/ui/fnc_initDisplayInterrupt.sqf index d39515f1c..92f3f05d2 100644 --- a/addons/ui/fnc_initDisplayInterrupt.sqf +++ b/addons/ui/fnc_initDisplayInterrupt.sqf @@ -44,11 +44,13 @@ if (!isMultiplayer && {getNumber (missionConfigFile >> "replaceAbortButton") > 0 ]; // --- create custom buttons +private _buttonType = ["RscButtonMenu", "RscButtonMenuLeft"] select isClass (configFile >> "CfgPatches" >> "A3_Data_F_Contact"); + { _offset = _offset + 1.1; _x params ["_displayName", "_tooltip", "_dialog"]; - private _button = _display ctrlCreate ["RscButtonMenu", -1]; + private _button = _display ctrlCreate [_buttonType, -1]; _button ctrlSetText toUpper _displayName; _button ctrlSetTooltip _tooltip;