Merge pull request #423 from CBATeam/settingsButtonMP

Fix placement of Settings button at GetReady map
CBATeam · Jul 12, 2016 · c3dd4aa · c3dd4aa
2 parents ec9e1a4 + 53551fb
commit c3dd4aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/addons/settings/gui.hpp b/addons/settings/gui.hpp
@@ -147,8 +147,8 @@ class CBA_ButtonConfigureSettings_base: RscButtonMenu {
     onButtonClick = QUOTE(ctrlParent (_this select 0) call COMPILE_FILE(openSettingsMenu));
     idc = IDC_BTN_SETTINGS;
     text = CSTRING(configureAddons);
-    x = POS_X(11.1);
-    y = POS_Y(23);
+    x = POS_X_LOW(11.1);
+    y = POS_Y_LOW(23);
     w = POS_W(10);
     h = POS_H(1);
 };

diff --git a/addons/settings/script_component.hpp b/addons/settings/script_component.hpp
@@ -42,7 +42,9 @@
 #define IS_APEX (productVersion select 2 >= 162)
 
 #define POS_X(N) ((N) * GUI_GRID_W + ([GUI_GRID_X, GUI_GRID_CENTER_X] select IS_APEX))
+#define POS_X_LOW(N) ((N) * GUI_GRID_W + GUI_GRID_X)
 #define POS_Y(N) ((N) * GUI_GRID_H + ([GUI_GRID_Y, GUI_GRID_CENTER_Y] select IS_APEX))
+#define POS_Y_LOW(N) ((N) * GUI_GRID_H + GUI_GRID_Y)
 #define POS_W(N) ((N) * GUI_GRID_W)
 #define POS_H(N) ((N) * GUI_GRID_H)