Merge pull request #398 from CBATeam/fix-help-ui-scales

Fix misalligned credits bar
CBATeam · Jun 23, 2016 · a87f99b · a87f99b
2 parents 0475841 + 182d044
commit a87f99b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/addons/help/CfgRscStd.hpp b/addons/help/CfgRscStd.hpp
@@ -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;
     };

diff --git a/addons/help/fnc_setCreditsLine.sqf b/addons/help/fnc_setCreditsLine.sqf
@@ -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 = "";
 
@@ -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];
diff --git a/addons/help/script_dialog_defines.hpp b/addons/help/script_dialog_defines.hpp
@@ -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)