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.

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

add keepAspectRatio parameter to Layout Editor #1059

Merged
merged 2 commits into from
Feb 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions addons/ui/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ class Extended_DisplayLoad_EventHandlers {
class RscDisplayMultiplayerSetup {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMultiplayerSetup)'));
};
class RscDisplayOptionsLayout {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayOptionsLayout)'));
};
class RscDisplayPassword {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayPassword)'));
};
Expand Down
1 change: 1 addition & 0 deletions addons/ui/XEH_preStart.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@

PREP(initDisplayInterrupt);
PREP(initDisplayMultiplayerSetup);
PREP(initDisplayOptionsLayout);
PREP(initDisplayPassword);
PREP(initDisplayRemoteMissions);
68 changes: 68 additions & 0 deletions addons/ui/fnc_initDisplayOptionsLayout.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#include "script_component.hpp"

#define IDCBASE 12000

params ["_display"];

for "_idc" from IDCBASE to (IDCBASE + 99) do {
private _control = _display displayCtrl _idc;

private _fnc_keepAspectRatio = {
params ["_control"];
uiNamespace getVariable "RscDisplayOptionsLayout_data" select (ctrlIDC _control - IDCBASE) params ["_tagName", "_varName", "", "_canResize", "_grid"];
if !(_canResize) exitWith {};

private _config = configFile >> "CfgUIGrids" >> _tagName >> "Variables" >> _varName;
private _keepAspectRatio = getNumber (_config >> "keepAspectRatio") == 1;
if !(_keepAspectRatio) exitWith {};

private _varBase = _tagName + "_" + _varName + "_";
_grid params ["_pos", "_gridW", "_gridH"];
_pos params ["_posX", "_posY", "_posW", "_posH"];

if (_posX isEqualType "") then {_posX = call compile _posX};
if (_posY isEqualType "") then {_posY = call compile _posY};
if (_posW isEqualType "") then {_posW = call compile _posW};
if (_posH isEqualType "") then {_posH = call compile _posH};

private _aspectRatio = _posW/_posH;

private _posXTemp = uiNamespace getVariable [_varBase + "X", _posX];
private _posYTemp = uiNamespace getVariable [_varBase + "Y", _posY];
private _posWTemp = uiNamespace getVariable [_varBase + "W", _posW];
private _posHTemp = uiNamespace getVariable [_varBase + "H", _posH];

if (_posXTemp isEqualType "") then {_posXTemp = call compile _posXTemp};
if (_posYTemp isEqualType "") then {_posYTemp = call compile _posYTemp};
if (_posWTemp isEqualType "") then {_posWTemp = call compile _posWTemp};
if (_posHTemp isEqualType "") then {_posHTemp = call compile _posHTemp};

private _aspectRatioTemp = _posWTemp/_posHTemp;

if (_aspectRatio != _aspectRatioTemp) then {
// correct aspect ratio
_posHTemp = _posWTemp/_aspectRatio;

// update values
uiNamespace setVariable [_varBase + "X", _posXTemp];
uiNamespace setVariable [_varBase + "Y", _posYTemp];
uiNamespace setVariable [_varBase + "W", _posWTemp];
uiNamespace setVariable [_varBase + "H", _posHTemp];

// apply values
private _script = _control getVariable [QGVAR(setPos), scriptNull];
terminate _script;
_script = [_control, [_posXTemp, _posYTemp, _posWTemp, _posHTemp]] spawn {
isNil {
params ["_control", "_posTemp"];
_control ctrlSetPosition _posTemp;
_control ctrlCommit 0;
};
};
_control setVariable [QGVAR(setPos), _script];
};
};

_control ctrlAddEventHandler ["MouseMoving", _fnc_keepAspectRatio];
_control ctrlAddEventHandler ["MouseHolding", _fnc_keepAspectRatio];
};