Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix minor ui issues with Contact DLC ui modifications #1186

Merged
merged 2 commits into from
Jul 27, 2019
Merged

fix minor ui issues with Contact DLC ui modifications #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab0265a
fix minor ui issues with Contact DLC ui modifications
commy2 Jul 26, 2019
8355c32
fix another minor ui issue with Contact DLC ui modifications
commy2 Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/settings/fnc_gui_sourceChanged.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down
4 changes: 3 additions & 1 deletion addons/ui/fnc_initDisplayInterrupt.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down