From e0ddf3169be59ddaee6717795190308119e15956 Mon Sep 17 00:00:00 2001 From: commy2 Date: Thu, 23 Jun 2016 13:22:14 +0200 Subject: [PATCH 1/2] adjust settings 'RscDisplayConfigure' grid to 1.62 --- addons/settings/gui.hpp | 4 ++-- addons/settings/script_component.hpp | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/addons/settings/gui.hpp b/addons/settings/gui.hpp index 7e24986e4..2811cdd2b 100644 --- a/addons/settings/gui.hpp +++ b/addons/settings/gui.hpp @@ -180,8 +180,8 @@ class GVAR(presets) { class controls { class CBA_Presets: RscControlsGroup { idc = IDC_PRESETS_GROUP; - x = POS_X_CENTERED(10); - y = POS_Y_CENTERED(0.9); + x = POS_X(10); + y = POS_Y(0.9); w = POS_W(20); h = POS_H(22.2); diff --git a/addons/settings/script_component.hpp b/addons/settings/script_component.hpp index ca4529c93..f4a2b5638 100644 --- a/addons/settings/script_component.hpp +++ b/addons/settings/script_component.hpp @@ -39,14 +39,11 @@ #define IDC_PRESETS_CANCEL 8006 #define IDC_PRESETS_DELETE 8007 -#define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_X) -#define POS_Y(N) ((N) * GUI_GRID_H + GUI_GRID_Y) +#define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X) +#define POS_Y(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y) #define POS_W(N) ((N) * GUI_GRID_W) #define POS_H(N) ((N) * GUI_GRID_H) -#define POS_X_CENTERED(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X) -#define POS_Y_CENTERED(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y) - #define COLOR_TEXT_DISABLED [1,1,1,0.3] #define COLOR_BUTTON_ENABLED [1,1,1,1] #define COLOR_BUTTON_DISABLED [0,0,0,1] From 66333ebf8544624d5b038f4b59fce68639aa98f0 Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 11 Jul 2016 10:05:39 +0200 Subject: [PATCH 2/2] also support pre Apex versions --- addons/settings/gui.hpp | 4 ++-- addons/settings/script_component.hpp | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/settings/gui.hpp b/addons/settings/gui.hpp index 2811cdd2b..7e24986e4 100644 --- a/addons/settings/gui.hpp +++ b/addons/settings/gui.hpp @@ -180,8 +180,8 @@ class GVAR(presets) { class controls { class CBA_Presets: RscControlsGroup { idc = IDC_PRESETS_GROUP; - x = POS_X(10); - y = POS_Y(0.9); + x = POS_X_CENTERED(10); + y = POS_Y_CENTERED(0.9); w = POS_W(20); h = POS_H(22.2); diff --git a/addons/settings/script_component.hpp b/addons/settings/script_component.hpp index f4a2b5638..557aad931 100644 --- a/addons/settings/script_component.hpp +++ b/addons/settings/script_component.hpp @@ -39,11 +39,16 @@ #define IDC_PRESETS_CANCEL 8006 #define IDC_PRESETS_DELETE 8007 -#define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X) -#define POS_Y(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y) +#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_Y(N) ((N) * GUI_GRID_H + ([GUI_GRID_Y, GUI_GRID_CENTER_Y] select IS_APEX)) #define POS_W(N) ((N) * GUI_GRID_W) #define POS_H(N) ((N) * GUI_GRID_H) +#define POS_X_CENTERED(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X) +#define POS_Y_CENTERED(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y) + #define COLOR_TEXT_DISABLED [1,1,1,0.3] #define COLOR_BUTTON_ENABLED [1,1,1,1] #define COLOR_BUTTON_DISABLED [0,0,0,1]