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 misalligned credits bar #398

Merged
merged 2 commits into from
Jun 23, 2016
Merged

Fix misalligned credits bar #398

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
6e10dfe
fix misaligned credits ui on bigger interface sizes, fix #362
commy2 Jun 23, 2016
182d044
remove url from credits
commy2 Jun 23, 2016
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
6 changes: 3 additions & 3 deletions addons/help/CfgRscStd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ class RscStructuredText;
class CBA_Credits_Cont: RscStructuredText {
idc = -1; //template
colorBackground[] = {0,0,0,0};
__SX(25);
__SX(8);
__SY(23);
__SW(30);
__SW(26);
__SH(1);

class Attributes {
font = "RobotoCondensed";
align = "center";
valign = "bottom";
valign = "center";
color = "#bdcc9c";
size = 0.8;
};
Expand Down
21 changes: 1 addition & 20 deletions addons/help/fnc_setCreditsLine.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,6 @@ if (isArray (_entry >> "authors")) then {
} forEach _authors;
};

// url if any
private _url = "";

if (isText (_entry >> "url")) then {
_url = getText (_entry >> "url");

if (!CBA_MonochromeCredits) then {
_url = format ["<t color='#566D7E'>%1</t>", _url];
};
} else {
if (isText (_entry >> "authorUrl")) then {
_url = getText (_entry >> "authorUrl");

if (!CBA_MonochromeCredits) then {
_url = format ["<t color='#566D7E'>%1</t>", _url];
};
};
};

// version if any
private _version = "";

Expand All @@ -97,4 +78,4 @@ if (isText (_entry >> "version")) then {
};

// add single line
_ctrl ctrlSetStructuredText parseText format ["%1%2 by %3 %4", _name, _version, _author, _url];
_ctrl ctrlSetStructuredText parseText format ["%1%2 by %3 %4", _name, _version, _author];
2 changes: 1 addition & 1 deletion addons/help/script_dialog_defines.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define __W SafeZoneW
#define __H SafeZoneH

#define __SX(var1) x = QUOTE(var1 * GUI_GRID_W + GUI_GRID_X)
#define __SX(var1) x = QUOTE(var1 * GUI_GRID_W + GUI_GRID_CENTER_X)
#define __SY(var1) y = QUOTE(var1 * GUI_GRID_H + GUI_GRID_Y)
#define __SW(var1) w = QUOTE(var1 * GUI_GRID_W)
#define __SH(var1) h = QUOTE(var1 * GUI_GRID_H)
Expand Down