change color of name of temporarily changed settings (#952)

* change color of name of temporarily changed settings * change color when toggling priority * disable debug
CBATeam · Jul 23, 2018 · 8eaac30 · 8eaac30
1 parent 3687f67
commit 8eaac30
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 0 deletions.
diff --git a/addons/settings/fnc_gui_refresh.sqf b/addons/settings/fnc_gui_refresh.sqf
@@ -23,9 +23,12 @@ private _controls = allControls _display select {ctrlIDC _x isEqualTo IDC_SETTIN
     private _source = _x getVariable QGVAR(source);
 
     private _value = GET_TEMP_NAMESPACE_VALUE(_setting,_source);
+    private _wasEdited = false;
 
     if (isNil "_value") then {
         _value = [_setting, _source] call FUNC(get);
+    } else {
+        _wasEdited = true;
     };
 
     [_x, _value] call (_x getVariable QFUNC(updateUI));
@@ -34,7 +37,15 @@ private _controls = allControls _display select {ctrlIDC _x isEqualTo IDC_SETTIN
 
     if (isNil "_priority") then {
         _priority = [_setting, _source] call FUNC(priority);
+    } else {
+        _wasEdited = true;
     };
 
     [_x, _priority] call (_x getVariable QFUNC(updateUI_priority));
+
+    // change color if setting was edited
+    if (_wasEdited) then {
+        private _ctrlSettingName = _x controlsGroupCtrl IDC_SETTING_NAME;
+        _ctrlSettingName ctrlSetTextColor COLOR_TEXT_ENABLED_WAS_EDITED;
+    };
 } forEach _controls;
diff --git a/addons/settings/fnc_gui_settingDefault.sqf b/addons/settings/fnc_gui_settingDefault.sqf
@@ -18,6 +18,9 @@ _ctrlDefault ctrlAddEventHandler ["ButtonClick", {
 
     private _controlsGroup = ctrlParentControlsGroup _ctrlDefault;
     [_controlsGroup, _defaultValue] call (_controlsGroup getVariable QFUNC(updateUI));
+
+    private _ctrlSettingName = _controlsGroup controlsGroupCtrl IDC_SETTING_NAME;
+    _ctrlSettingName ctrlSetTextColor COLOR_TEXT_ENABLED_WAS_EDITED;
 }];
 
 if (_currentValue isEqualTo _defaultValue) then {

diff --git a/addons/settings/fnc_gui_settingOverwrite.sqf b/addons/settings/fnc_gui_settingOverwrite.sqf
@@ -31,6 +31,9 @@ _ctrlOverwriteClient setVariable [QFUNC(event), {
     SET_TEMP_NAMESPACE_PRIORITY(_setting,_state,_source);
 
     _controlsGroup call (_controlsGroup getVariable QFUNC(updateUI_locked));
+
+    private _ctrlSettingName = _controlsGroup controlsGroupCtrl IDC_SETTING_NAME;
+    _ctrlSettingName ctrlSetTextColor COLOR_TEXT_ENABLED_WAS_EDITED;
 }];
 
 _controlsGroup setVariable [QFUNC(auto_check_overwrite), {
@@ -44,6 +47,9 @@ _controlsGroup setVariable [QFUNC(auto_check_overwrite), {
             [_ctrlOverwriteClient, 1] call (_ctrlOverwriteClient getVariable QFUNC(event));
         };
     };
+
+    private _ctrlSettingName = _controlsGroup controlsGroupCtrl IDC_SETTING_NAME;
+    _ctrlSettingName ctrlSetTextColor COLOR_TEXT_ENABLED_WAS_EDITED;
 }];
 
 _ctrlOverwriteMission ctrlAddEventHandler ["CheckedChanged", {
@@ -69,6 +75,9 @@ _ctrlOverwriteMission ctrlAddEventHandler ["CheckedChanged", {
     };
 
     _controlsGroup call (_controlsGroup getVariable QFUNC(updateUI_locked));
+
+    private _ctrlSettingName = _controlsGroup controlsGroupCtrl IDC_SETTING_NAME;
+    _ctrlSettingName ctrlSetTextColor COLOR_TEXT_ENABLED_WAS_EDITED;
 }];
 
 // update overwrite checkboxes

diff --git a/addons/settings/gui_createCategory.sqf b/addons/settings/gui_createCategory.sqf
@@ -65,13 +65,19 @@ private _lastSubCategory = "$START";
         private _source = toLower _x;
 
         private _currentValue = GET_TEMP_NAMESPACE_VALUE(_setting,_source);
+        private _wasEdited = false;
+
         if (isNil "_currentValue") then {
             _currentValue = [_setting, _source] call FUNC(get);
+        } else {
+            _wasEdited = true;
         };
 
         private _currentPriority = GET_TEMP_NAMESPACE_PRIORITY(_setting,_source);
         if (isNil "_currentPriority") then {
             _currentPriority = [_setting, _source] call FUNC(priority);
+        } else {
+            _wasEdited = true;
         };
 
         // ----- create or retrieve options "list" controls group
@@ -143,6 +149,11 @@ private _lastSubCategory = "$START";
         _ctrlSettingName ctrlSetText format ["%1:", _displayName];
         _ctrlSettingName ctrlSetTooltip _tooltip;
 
+        // change color if setting was edited
+        if (_wasEdited) then {
+            _ctrlSettingName ctrlSetTextColor COLOR_TEXT_ENABLED_WAS_EDITED;
+        };
+
         // ----- execute setting script
         private _script = getText (configFile >> ctrlClassName _ctrlSettingGroup >> QGVAR(script));
         [_ctrlSettingGroup, _setting, _source, _currentValue, _settingData] call (uiNamespace getVariable _script);

diff --git a/addons/settings/script_component.hpp b/addons/settings/script_component.hpp
@@ -87,6 +87,7 @@
 #define TABLE_LINE_SPACING POS_H(0.4)
 
 #define COLOR_TEXT_ENABLED [1, 1, 1, 1]
+#define COLOR_TEXT_ENABLED_WAS_EDITED [0.95, 0.95, 0.1, 1]
 #define COLOR_TEXT_DISABLED [1, 1, 1, 0.4]
 #define COLOR_BUTTON_ENABLED [1, 1, 1, 1]
 #define COLOR_BUTTON_DISABLED [0, 0, 0, 1]