Cleanup

CBATeam · Jul 26, 2016 · 1242e74 · 1242e74
1 parent 9fc8756
commit 1242e74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/addons/settings/gui_createMenu_color.sqf b/addons/settings/gui_createMenu_color.sqf
@@ -52,7 +52,7 @@ for "_index" from 0 to (((count _defaultValue max 3) min 4) - 1) do {
         (_control getVariable QGVAR(data)) params ["_setting", "_source", "_currentValue", "_color"];
         private _index = _control getVariable QGVAR(index);
 
-        (_control getVariable QGVAR(linkedControls)) params ["_ctrlSettingPreview", "_linkedControls"];
+        (_control getVariable QGVAR(linkedControls)) params ["_ctrlSettingPreview", "_linkedControls", "_defaultControl"];
         private _linkedControl = _linkedControls select _index select 1;
         _linkedControl ctrlSetText ([_value, 1, 2] call CBA_fnc_formatNumber);
 
@@ -62,7 +62,6 @@ for "_index" from 0 to (((count _defaultValue max 3) min 4) - 1) do {
         SET_TEMP_NAMESPACE_VALUE(_setting,_currentValue,_source);
 
         //If new setting is same as default value, grey out the default button
-        (_control getVariable QGVAR(linkedControls)) params ["", "", "_defaultControl"];
         (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
         _defaultControl ctrlEnable (!(_currentValue isEqualTo _defaultValue));
     }];
@@ -94,7 +93,7 @@ for "_index" from 0 to (((count _defaultValue max 3) min 4) - 1) do {
         (_control getVariable QGVAR(data)) params ["_setting", "_source", "_currentValue", "_color"];
         private _index = _control getVariable QGVAR(index);
 
-        (_control getVariable QGVAR(linkedControls)) params ["_ctrlSettingPreview", "_linkedControls"];
+        (_control getVariable QGVAR(linkedControls)) params ["_ctrlSettingPreview", "_linkedControls", "_defaultControl"];
 
         private _linkedControl = _linkedControls select _index select 0;
         _linkedControl sliderSetPosition _value;
@@ -105,7 +104,6 @@ for "_index" from 0 to (((count _defaultValue max 3) min 4) - 1) do {
         SET_TEMP_NAMESPACE_VALUE(_setting,_currentValue,_source);
 
         //If new setting is same as default value, grey out the default button
-        (_control getVariable QGVAR(linkedControls)) params ["", "", "_defaultControl"];
         (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
         _defaultControl ctrlEnable (!(_currentValue isEqualTo _defaultValue));
     }];

diff --git a/addons/settings/gui_createMenu_default.sqf b/addons/settings/gui_createMenu_default.sqf
@@ -23,6 +23,7 @@ _ctrlSettingDefault ctrlAddEventHandler ["ButtonClick", {
     (_control getVariable QGVAR(data)) params ["_setting", "_source", "_defaultValue", "_settingType", "_settingData"];
     SET_TEMP_NAMESPACE_VALUE(_setting,_defaultValue,_source);
 
+    // Can disable button as the setting will now be the default
     _control ctrlEnable false;
 
     private _linkedControls = _control getVariable QGVAR(linkedControls);

diff --git a/addons/settings/gui_createMenu_slider.sqf b/addons/settings/gui_createMenu_slider.sqf
@@ -26,13 +26,12 @@ _ctrlSetting ctrlAddEventHandler ["SliderPosChanged", {
 
     (_control getVariable QGVAR(data)) params ["_setting", "_source", "_trailingDecimals"];
 
-    private _linkedControl = _control getVariable QGVAR(linkedControls) select 1;
+    (_control getVariable QGVAR(linkedControls)) params ["", "_linkedControl", "_defaultControl"];
     _linkedControl ctrlSetText ([_value, 1, _trailingDecimals] call CBA_fnc_formatNumber);
 
     SET_TEMP_NAMESPACE_VALUE(_setting,_value,_source);
 
     //If new setting is same as default value, grey out the default button
-    (_control getVariable QGVAR(linkedControls)) params ["", "", "_defaultControl"];
     (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
     _defaultControl ctrlEnable (!(_value isEqualTo _defaultValue));
 }];
@@ -59,14 +58,13 @@ _ctrlSettingEdit ctrlAddEventHandler ["KeyUp", {
 
     private _value = parseNumber ctrlText _control;
 
-    private _linkedControl = _control getVariable QGVAR(linkedControls) select 0;
+    (_control getVariable QGVAR(linkedControls)) params ["_linkedControl", "", "_defaultControl"];
     _linkedControl sliderSetPosition _value;
 
     _value = sliderPosition _linkedControl;
     SET_TEMP_NAMESPACE_VALUE(_setting,_value,_source);
 
     //If new setting is same as default value, grey out the default button
-    (_control getVariable QGVAR(linkedControls)) params ["", "", "_defaultControl"];
     (_defaultControl getVariable QGVAR(data)) params ["", "", "_defaultValue"];
     _defaultControl ctrlEnable (!(_value isEqualTo _defaultValue));
 }];