Fixed profile GUI colors not working #477

ArmaAchilles · Jun 22, 2019 · 410412d · 410412d
1 parent c1ff1f8
commit 410412d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 318 deletions.
diff --git a/addons/dialog/dynamicDialog.hpp b/addons/dialog/dynamicDialog.hpp
@@ -47,7 +47,7 @@ class GVAR(display) {
             y = POS_TITLE_Y(MIN_HEIGHT);
             w = POS_W(27);
             h = POS_H(1);
-            colorBackground[] = GUI_BCG_COLOR;
+            colorBackground[] = THEME_COLORS;
             moving = 1;
         };
         class Background: RscText {

diff --git a/addons/dialog/script_component.hpp b/addons/dialog/script_component.hpp
@@ -19,7 +19,6 @@
 
 #include "\a3\ui_f\hpp\defineDIKCodes.inc"
 #include "\a3\ui_f\hpp\defineCommonGrids.inc"
-#include "\a3\ui_f\hpp\defineCommonColors.inc"
 #include "\a3\ui_f_curator\ui\defineResinclDesign.inc"
 
 #define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X)
@@ -40,4 +39,10 @@
 #define POS_TITLE_Y(HEIGHT)      (POS_BACKGROUND_Y(HEIGHT) - VERTICAL_SPACING - POS_H(1))
 #define POS_BUTTON_Y(HEIGHT)     (0.5 + HEIGHT / 2 + CONTENT_SPACING + VERTICAL_SPACING)
 
+#define THEME_COLOR_RGB_R "(profileNamespace getVariable ['GUI_BCG_RGB_R',0.13])"
+#define THEME_COLOR_RGB_G "(profileNamespace getVariable ['GUI_BCG_RGB_G',0.54])"
+#define THEME_COLOR_RGB_B "(profileNamespace getVariable ['GUI_BCG_RGB_B',0.21])"
+#define THEME_COLOR_ALPHA "(profileNamespace getVariable ['GUI_BCG_RGB_A',0.8])"
+#define THEME_COLORS {THEME_COLOR_RGB_R,THEME_COLOR_RGB_G,THEME_COLOR_RGB_B,THEME_COLOR_ALPHA}
+
 #include "script_idc.hpp"
diff --git a/include/a3/ui_f/hpp/defineCommonColors.inc b/include/a3/ui_f/hpp/defineCommonColors.inc