diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/AchillesDynamicDialog.h b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/AchillesDynamicDialog.h index 949db99f..9d9a99bd 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/AchillesDynamicDialog.h +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/AchillesDynamicDialog.h @@ -3,12 +3,14 @@ #define GUI_GRID_Y (0.177 * safeZoneH + safeZoneY) #define GUI_GRID_W (0.010 * safeZoneW) #define GUI_GRID_H (0.022 * safeZoneH) +#define GUI_GRID_H_FIX (0.04) //converts GUI grid to GUI coordinates #define GtC_X(GRID) (GRID) * GUI_GRID_W + GUI_GRID_X #define GtC_Y(GRID) (GRID) * GUI_GRID_H + GUI_GRID_Y #define GtC_W(GRID) (GRID) * GUI_GRID_W #define GtC_H(GRID) (GRID) * GUI_GRID_H +#define GtC_H_FIX(GRID) GRID * GUI_GRID_H_FIX #define DYNAMIC_GUI_IDD 133798 #define DYNAMIC_TITLE_IDC 1000 @@ -19,24 +21,24 @@ #define BG_WIDTH (40 * GUI_GRID_W) #define START_ROW_Y (0) #define MAX_ALL_ROWS_H (29.4 * GUI_GRID_H) -#define LABEL_COMBO_H (0.5 * GUI_GRID_H) +#define LABEL_COMBO_H (0.5 * GUI_GRID_H_FIX) #define LABEL_COLUMN_X (0.5 * GUI_GRID_W) #define LABEL_WIDTH (39 * GUI_GRID_W) -#define LABEL_HEIGHT (2 * GUI_GRID_H) +#define LABEL_HEIGHT (2 * GUI_GRID_H_FIX) #define LABEL_BG_COLOR [0,0,0,0.6] #define COMBO_COLUMN_X (16 * GUI_GRID_W) #define COMBO_WIDTH (22.5 * GUI_GRID_W) -#define COMBO_HEIGHT (1 * GUI_GRID_H) +#define COMBO_HEIGHT (1 * GUI_GRID_H_FIX) #define OK_BUTTON_X (29.5 * GUI_GRID_W) #define OK_BUTTON_WIDTH (4 * GUI_GRID_W) -#define OK_BUTTON_HEIGHT (1.5 * GUI_GRID_H) +#define OK_BUTTON_HEIGHT (1.5 * GUI_GRID_H_FIX) #define CANCEL_BUTTON_X (34 * GUI_GRID_W) #define CANCEL_BUTTON_WIDTH (4.5 * GUI_GRID_W) -#define CANCEL_BUTTON_HEIGHT (1.5 * GUI_GRID_H) -#define TOTAL_ROW_HEIGHT (2.1 * GUI_GRID_H) +#define CANCEL_BUTTON_HEIGHT (1.5 * GUI_GRID_H_FIX) +#define TOTAL_ROW_HEIGHT (2.1 * GUI_GRID_H_FIX) -#define FONT_SIZE (1.2 * GUI_GRID_H) +#define DEFAULT_FONT_SIZE (GUI_GRID_H_FIX) #define BASE_IDC_LABEL (10000) #define BASE_IDC_CTRL (20000) diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/fn_ShowChooseDialog.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/fn_ShowChooseDialog.sqf index eb78eb68..b696287b 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/fn_ShowChooseDialog.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/common/fn_ShowChooseDialog.sqf @@ -33,7 +33,7 @@ private _tot_height = 0; _x params [["_control_type","",[""]]]; switch (_control_type) do { - case "ALLSIDES"; case "SIDES": {_tot_height = _tot_height + GtC_H(4.1)}; + case "ALLSIDES"; case "SIDES": {_tot_height = _tot_height + GtC_H_FIX(4.1)}; case "MESSAGE"; case "SCRIPT": {_tot_height = _tot_height + TOTAL_ROW_HEIGHT + 4*COMBO_HEIGHT}; default {_tot_height = _tot_height + TOTAL_ROW_HEIGHT}; }; @@ -48,7 +48,7 @@ _ctrl_group ctrlSetPosition _pos; _ctrl_group ctrlCommit 0; // adjust dialog bottom accordingly -private _yCoord = GUI_GRID_Y + GtC_H(1.5) + GtC_H(0.4) + _tot_height + GtC_H(0.4); +private _yCoord = GUI_GRID_Y + GtC_H_FIX(1.5) + GtC_H_FIX(0.4) + _tot_height + GtC_H_FIX(0.4); { private _bottomCtrl = _dialog displayCtrl _x; _pos = ctrlPosition _bottomCtrl; @@ -58,7 +58,7 @@ private _yCoord = GUI_GRID_Y + GtC_H(1.5) + GtC_H(0.4) + _tot_height + GtC_H(0.4 } forEach DYNAMIC_BOTTOM_IDCs; // Resize the background accordingly -_yCoord = _yCoord + TOTAL_ROW_HEIGHT; +_yCoord = _yCoord + GtC_H_FIX(1.5) + GtC_H_FIX(0.4); private _background = _dialog displayCtrl DYNAMIC_BG_IDC; _pos = ctrlPosition _background; _pos set [3, _yCoord - (_pos select 1)]; @@ -100,16 +100,16 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", _label_data params [["_label_text","",[""]], ["_tooltip_text","",[""]]]; private _ctrl_label = _dialog ctrlCreate ["RscText", BASE_IDC_LABEL + _forEachIndex, _ctrl_group]; _ctrl_label ctrlSetText _label_text; - _ctrl_label ctrlSetFontHeight FONT_SIZE; + _ctrl_label ctrlSetFontHeight DEFAULT_FONT_SIZE; _ctrl_label ctrlSetTooltip _tooltip_text; _ctrl_label ctrlSetBackgroundColor LABEL_BG_COLOR; _ctrl_label ctrlSetPosition [LABEL_COLUMN_X, _yCoord, LABEL_WIDTH, LABEL_HEIGHT]; _ctrl_label ctrlCommit 0; // Create the combo box - private _ctrl_cb = _dialog ctrlCreate ["RscCombo", BASE_IDC_CTRL + _forEachIndex, _ctrl_group]; + private _ctrl_cb = _dialog ctrlCreate ["RscAchillesCombo", BASE_IDC_CTRL + _forEachIndex, _ctrl_group]; _ctrl_cb ctrlSetPosition [COMBO_COLUMN_X, _yCoord+LABEL_COMBO_H, COMBO_WIDTH, COMBO_HEIGHT]; - _ctrl_cb ctrlSetFontHeight FONT_SIZE; + _ctrl_cb ctrlSetFontHeight DEFAULT_FONT_SIZE; private _use_data = false; { _x params [["_entry_text_L","",[""]], ["_entry_text_R","",[""]], ["_str_data","",[""]]]; @@ -169,7 +169,7 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", _label_data params [["_label_text","",[""]], ["_tooltip_text","",[""]]]; private _ctrl_label = _dialog ctrlCreate ["RscText", BASE_IDC_LABEL + _forEachIndex, _ctrl_group]; _ctrl_label ctrlSetText _label_text; - _ctrl_label ctrlSetFontHeight FONT_SIZE; + _ctrl_label ctrlSetFontHeight DEFAULT_FONT_SIZE; _ctrl_label ctrlSetTooltip _tooltip_text; _ctrl_label ctrlSetBackgroundColor LABEL_BG_COLOR; _ctrl_label ctrlSetPosition [LABEL_COLUMN_X, _yCoord, LABEL_WIDTH, LABEL_HEIGHT]; @@ -229,7 +229,7 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", _label_data params [["_label_text","",[""]], ["_tooltip_text","",[""]]]; private _ctrl_label = _dialog ctrlCreate ["RscText", BASE_IDC_LABEL + _forEachIndex, _ctrl_group]; _ctrl_label ctrlSetText _label_text; - _ctrl_label ctrlSetFontHeight FONT_SIZE; + _ctrl_label ctrlSetFontHeight DEFAULT_FONT_SIZE; _ctrl_label ctrlSetTooltip _tooltip_text; _ctrl_label ctrlSetBackgroundColor LABEL_BG_COLOR; _ctrl_label ctrlSetPosition [LABEL_COLUMN_X, _yCoord, LABEL_WIDTH, LABEL_HEIGHT + _add_height]; @@ -243,7 +243,7 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", // Adjust default choice if it is invalid and select the current choice if (!(_default_choice isEqualType "")) then {_default_choice = ""}; _ctrl_edit ctrlSetText _default_choice; - _ctrl_edit ctrlSetFontHeight FONT_SIZE; + _ctrl_edit ctrlSetFontHeight DEFAULT_FONT_SIZE; // Set the current choice in a global variable and update the default value as well uiNamespace setVariable [_defaultVariableId, _default_choice]; diff --git a/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesModuleTree.hpp b/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesModuleTree.hpp index f35e9ee4..dad3bffc 100644 --- a/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesModuleTree.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesModuleTree.hpp @@ -25,7 +25,7 @@ class Add: RscControlsGroupNoScrollbars w = "19 * (((safezoneW / safezoneH) min 1.2) / 40)"; h = "1.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; colorBackground[] = {0.518,0.016,0,0.8}; - sizeEx = 1.2 * GUI_GRID_H; + sizeEx = 1.2 * GUI_GRID_H_FIX; }; class Ares_Icon_Background_Attr: IGUIBack { diff --git a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscBaseClasses.hpp b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscBaseClasses.hpp index 6b160ac6..9107cb9e 100644 --- a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscBaseClasses.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscBaseClasses.hpp @@ -101,9 +101,12 @@ #define GUI_GRID_X (0.294 * safeZoneW + safeZoneX) #define GUI_GRID_Y (0.177 * safeZoneH + safeZoneY) #define GUI_GRID_W (0.010 * safeZoneW) +#define GUI_GRID_W_FIX (0.025) #define GUI_GRID_H (0.022 * safeZoneH) +#define GUI_GRID_H_FIX (0.04) -#define FONT_SIZE (1.2 * GUI_GRID_H) +#define TITLE_FONT_SIZE (1.2 * GUI_GRID_H_FIX) +#define DEFAULT_FONT_SIZE (1.0 * GUI_GRID_H_FIX) // Forward declare some default base classes. class IGUIBack; @@ -152,6 +155,12 @@ class RscAchillesXSliderH: RscXSliderH { colorBackground[] = {0,0,0,1}; }; +class RscAchillesCombo : RscCombo +{ + h = 1 * GUI_GRID_H_FIX; + rowHeight = 1.1 * GUI_GRID_H_FIX; + wholeHeight = 6.5 * GUI_GRID_H_FIX; +}; class RscAchillesEdit: RscEdit { autocomplete = "general"; diff --git a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogCompositions.hpp b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogCompositions.hpp index 1956a813..80f44cec 100644 --- a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogCompositions.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogCompositions.hpp @@ -15,12 +15,12 @@ class Ares_composition_Dialog moving = 1; text = "$STR_AMAE_ADVANCED_COMPOSITION"; //--- ToDo: Localize; - x = 9.5 * GUI_GRID_W + GUI_GRID_X; + x = 7.5 * GUI_GRID_W + 2 * GUI_GRID_W_FIX + GUI_GRID_X; y = 0.5 * GUI_GRID_H + GUI_GRID_Y; - w = 24 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 26 * GUI_GRID_W - 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = TITLE_FONT_SIZE; + sizeEx = TITLE_FONT_SIZE; colorBackground[] = {0.518,0.016,0,0.8}; }; class Ares_Main_Background: IGUIBack @@ -28,21 +28,21 @@ class Ares_composition_Dialog idc = 2000; x = 7.5 * GUI_GRID_W + GUI_GRID_X; - y = 2 * GUI_GRID_H + GUI_GRID_Y; + y = 0.5 * GUI_GRID_H + 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 26 * GUI_GRID_W; h = 20.5 * GUI_GRID_H; colorBackground[] = {0.2,0.2,0.2,0.8}; }; - class Ares_Dialog_Bottom: IGUIBack + class Ares_Dialog_Bottom_Bar: IGUIBack { idc = 2010; - x = 14.5 * GUI_GRID_W + GUI_GRID_X; + x = 8.5 * GUI_GRID_W + 6 * GUI_GRID_W_FIX + GUI_GRID_X; y = 20.5 * GUI_GRID_H + GUI_GRID_Y; - w = 11 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 24 * GUI_GRID_W - 13 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorBackground[] = {0,0,0,0.6}; }; class Ares_Cancle_Button: RscButtonMenuCancel @@ -52,10 +52,10 @@ class Ares_composition_Dialog onButtonClick = "uiNamespace setVariable ['Ares_Dialog_Result', -1]; closeDialog 2;"; x = 8 * GUI_GRID_W + GUI_GRID_X; y = 20.5 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 6 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,0.8}; }; @@ -67,21 +67,21 @@ class Ares_composition_Dialog text = "$STR_AMAE_SPAWN"; //--- ToDo: Localize; - x = 26 * GUI_GRID_W + GUI_GRID_X; + x = 33 * GUI_GRID_W - 7 * GUI_GRID_W_FIX + GUI_GRID_X; y = 20.5 * GUI_GRID_H + GUI_GRID_Y; - w = 7 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 7 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; }; class Ares_Background_Edit: IGUIBack { idc = 2020; x = 8 * GUI_GRID_W + GUI_GRID_X; - y = 2.5 * GUI_GRID_H + GUI_GRID_Y; + y = 1 * GUI_GRID_H + 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 25 * GUI_GRID_W; - h = 17 * GUI_GRID_H; + h = 19 * GUI_GRID_H - 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0,0,0,0.6}; }; class Ares_Paragraph_edit: RscText @@ -90,11 +90,11 @@ class Ares_composition_Dialog text = "Select composition to edit or delete."; //--- ToDo: Localize; x = 8 * GUI_GRID_W + GUI_GRID_X; - y = 2.5 * GUI_GRID_H + GUI_GRID_Y; + y = 1 * GUI_GRID_H + 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 25.5 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; }; class Ares_composition_tree: RscTree { @@ -105,11 +105,11 @@ class Ares_composition_Dialog colorMarkedSelected[] = {1, 1, 1, 0.700000}; x = 8.5 * GUI_GRID_W + GUI_GRID_X; - y = 4 * GUI_GRID_H + GUI_GRID_Y; + y = 1 * GUI_GRID_H + 3 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 24 * GUI_GRID_W; - h = 15 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + h = 18.5 * GUI_GRID_H - 3 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {0.5,0.5,0.5,1}; colorBackground[] = {0,0,0,0.5}; }; @@ -119,8 +119,8 @@ class Ares_composition_Dialog x = 7.5 * GUI_GRID_W + GUI_GRID_X; y = 0.5 * GUI_GRID_H + GUI_GRID_Y; - w = 2 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + w = 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0.518,0.016,0,0.8}; }; class Ares_Icon: RscPicture @@ -130,8 +130,8 @@ class Ares_composition_Dialog text = "\achilles\data_f_achilles\icons\icon_achilles_dialog.paa"; x = 7.5 * GUI_GRID_W + GUI_GRID_X; y = 0.5 * GUI_GRID_H + GUI_GRID_Y; - w = 2 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + w = 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; }; class Ares_Delete_Button: RscActivePicture { @@ -144,10 +144,10 @@ class Ares_composition_Dialog soundPush[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundPush",0.09,1}; text = "a3\3den\Data\Displays\Display3DEN\PanelLeft\entityList_delete_ca.paa"; - x = 31 * GUI_GRID_W + GUI_GRID_X; + x = 33 * GUI_GRID_W - 2 * GUI_GRID_W_FIX + GUI_GRID_X; y = 20.5 * GUI_GRID_H + GUI_GRID_Y; - w = 2 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + w = 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; }; class Ares_Edit_Button: Ares_Delete_Button { @@ -155,10 +155,10 @@ class Ares_composition_Dialog onButtonClick = "([""EDIT_BUTTON""] + _this) call Achilles_fnc_RscDisplayAttributes_manageAdvancedComposition;"; text = "a3\3den\Data\Displays\Display3DEN\PanelRight\customcomposition_edit_ca.paa"; - x = 28.5 * GUI_GRID_W + GUI_GRID_X; + x = 33 * GUI_GRID_W - 4.5 * GUI_GRID_W_FIX + GUI_GRID_X; y = 20.5 * GUI_GRID_H + GUI_GRID_Y; - w = 2 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + w = 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; }; class Ares_New_Button: Ares_Delete_Button { @@ -166,10 +166,10 @@ class Ares_composition_Dialog onButtonClick = "([""NEW_BUTTON""] + _this) call Achilles_fnc_RscDisplayAttributes_manageAdvancedComposition;"; text = "a3\3den\Data\Displays\Display3DEN\PanelRight\customcomposition_add_ca.paa"; - x = 26 * GUI_GRID_W + GUI_GRID_X; + x = 33 * GUI_GRID_W - 7 * GUI_GRID_W_FIX + GUI_GRID_X; y = 20.5 * GUI_GRID_H + GUI_GRID_Y; - w = 2 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + w = 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; }; //////////////////////////////////////////////////////// diff --git a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogCopyPaste.hpp b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogCopyPaste.hpp index cc057b37..e3d20488 100644 --- a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogCopyPaste.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogCopyPaste.hpp @@ -17,12 +17,12 @@ class Ares_CopyPaste_Dialog moving = 1; text = "$STR_AMAE_COPY_PASTE_DIALOG"; //--- ToDo: Localize; - x = 2 * GUI_GRID_W + GUI_GRID_X; + x = 2 * GUI_GRID_W_FIX + GUI_GRID_X; y = 0 * GUI_GRID_H + GUI_GRID_Y; - w = 38 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 40 * GUI_GRID_W - 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = TITLE_FONT_SIZE; + sizeEx = TITLE_FONT_SIZE; colorBackground[] = {0.518,0.016,0,0.8}; }; class Ares_Main_Background: IGUIBack @@ -30,31 +30,30 @@ class Ares_CopyPaste_Dialog idc = 2000; x = 0 * GUI_GRID_W + GUI_GRID_X; - y = 1.5 * GUI_GRID_H + GUI_GRID_Y; + y = 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 40 * GUI_GRID_W; h = 20.5 * GUI_GRID_H; colorBackground[] = {0.2,0.2,0.2,0.8}; }; - class Ares_Dialog_Bottom: IGUIBack + class Ares_Dialog_Bottom_Bar: IGUIBack { idc = 2010; - - x = 7 * GUI_GRID_W + GUI_GRID_X; + x = 1 * GUI_GRID_W + 6 * GUI_GRID_W_FIX + GUI_GRID_X; y = 20 * GUI_GRID_H + GUI_GRID_Y; - w = 28 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + w = 38 * GUI_GRID_W - 10 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0,0,0,0.6}; }; class Ares_Ok_Button: RscButtonMenuOK { onButtonClick = "uiNamespace setVariable ['Ares_CopyPaste_Dialog_Result', 1]; closeDialog 1;"; idc = 3000; - x = 35.5 * GUI_GRID_W + GUI_GRID_X; + x = 39.5 * GUI_GRID_W - 4 * GUI_GRID_W_FIX + GUI_GRID_X; y = 20 * GUI_GRID_H + GUI_GRID_Y; - w = 4 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 4 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,0.8}; }; @@ -64,10 +63,10 @@ class Ares_CopyPaste_Dialog idc = 3010; x = 0.5 * GUI_GRID_W + GUI_GRID_X; y = 20 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 6 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,0.8}; }; @@ -76,9 +75,9 @@ class Ares_CopyPaste_Dialog idc = 2040; x = 0.5 * GUI_GRID_W + GUI_GRID_X; - y = 2 * GUI_GRID_H + GUI_GRID_Y; + y = 0.5 * GUI_GRID_H + 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 39 * GUI_GRID_W; - h = 17 * GUI_GRID_H; + h = 19 * GUI_GRID_H - 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0,0,0,0.6}; }; class Ares_Paragraph_edit: RscText @@ -87,11 +86,11 @@ class Ares_CopyPaste_Dialog text = "$STR_AMAE_COPY_PASTE_CLIPBOARD_CONTENTS_USING_KEYS"; //--- ToDo: Localize; x = 1 * GUI_GRID_W + GUI_GRID_X; - y = 2 * GUI_GRID_H + GUI_GRID_Y; + y = 0.5 * GUI_GRID_H + 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 39 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; }; class Ares_Edit: RscEdit { @@ -103,11 +102,11 @@ class Ares_CopyPaste_Dialog autocomplete = "scripting"; x = 1 * GUI_GRID_W + GUI_GRID_X; - y = 3.5 * GUI_GRID_H + GUI_GRID_Y; + y = 0.5 * GUI_GRID_H + 3 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 38 * GUI_GRID_W; - h = 15 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + h = 18.5 * GUI_GRID_H - 3 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {0.5,0.5,0.5,1}; colorBackground[] = {0,0,0,0.5}; }; @@ -116,9 +115,9 @@ class Ares_CopyPaste_Dialog idc = 2020; x = 0 * GUI_GRID_W + GUI_GRID_X; - y = 0 * GUI_GRID_H + GUI_GRID_Y; - w = 2 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + y = 0 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0.518,0.016,0,0.8}; }; class Ares_Icon: RscPicture @@ -126,10 +125,10 @@ class Ares_CopyPaste_Dialog idc = 2030; style = 48; text = "\achilles\data_f_achilles\icons\icon_achilles_dialog.paa"; - x = 0.2 * GUI_GRID_W + GUI_GRID_X; - y = 0.15 * GUI_GRID_H + GUI_GRID_Y; - w = 1.6 * GUI_GRID_W; - h = 1.2 * GUI_GRID_H; + x = 0.2 * GUI_GRID_W_FIX + GUI_GRID_X; + y = 0.15 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 1.6 * GUI_GRID_W_FIX; + h = 1.2 * GUI_GRID_H_FIX; }; //////////////////////////////////////////////////////// // GUI EDITOR OUTPUT END diff --git a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogDynamic.hpp b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogDynamic.hpp index f7efab68..7aae6455 100644 --- a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogDynamic.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogDynamic.hpp @@ -14,13 +14,13 @@ class Ares_Dynamic_Dialog idc = 1000; moving = 1; - text = "Execute Code"; //--- ToDo: Localize; - x = 2 * GUI_GRID_W + GUI_GRID_X; - y = 0 * GUI_GRID_H + GUI_GRID_Y; - w = 38 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + text = "Show Choose Dialog"; //--- ToDo: Localize; + x = 2 * GUI_GRID_W_FIX + GUI_GRID_X; + y = 0 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 40 * GUI_GRID_W - 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = TITLE_FONT_SIZE; + sizeEx = TITLE_FONT_SIZE; colorBackground[] = {0.518,0.016,0,0.8}; }; class Ares_Main_Background: IGUIBack @@ -28,39 +28,39 @@ class Ares_Dynamic_Dialog idc = 2000; x = 0 * GUI_GRID_W + GUI_GRID_X; - y = 1.5 * GUI_GRID_H + GUI_GRID_Y; + y = 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 40 * GUI_GRID_W; - h = 22.5 * GUI_GRID_H; + h = 22.5 * GUI_GRID_H_FIX; colorBackground[] = {0.2,0.2,0.2,0.8}; }; class Ares_Content: RscControlsGroup { idc = 7000; x = 0 * GUI_GRID_W + GUI_GRID_X; - y = 1.9 * GUI_GRID_H + GUI_GRID_Y; + y = 1.9 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 40 * GUI_GRID_W; - h = 22.5 * GUI_GRID_H; + h = 22.5 * GUI_GRID_H_FIX; }; - class Ares_Dialog_Bottom: IGUIBack + class Ares_Dialog_Bottom_Bar: IGUIBack { idc = 2010; - x = 7 * GUI_GRID_W + GUI_GRID_X; - y = 22 * GUI_GRID_H + GUI_GRID_Y; - w = 28 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + x = 1 * GUI_GRID_W + 6 * GUI_GRID_W_FIX + GUI_GRID_X; + y = 22 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 38 * GUI_GRID_W - 10 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0,0,0,0.6}; }; class Ares_Ok_Button: RscButtonMenuOK { onButtonClick = "uiNamespace setVariable ['Ares_ChooseDialog_Result', 1]; closeDialog 1;"; idc = 3000; - x = 35.5 * GUI_GRID_W + GUI_GRID_X; - y = 22 * GUI_GRID_H + GUI_GRID_Y; - w = 4 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + x = 39.5 * GUI_GRID_W - 4 * GUI_GRID_W_FIX + GUI_GRID_X; + y = 22 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 4 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,0.8}; }; @@ -69,11 +69,11 @@ class Ares_Dynamic_Dialog onButtonClick = "uiNamespace setVariable ['Ares_ChooseDialog_Result', -1]; closeDialog 2;"; idc = 3010; x = 0.5 * GUI_GRID_W + GUI_GRID_X; - y = 22 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + y = 22 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 6 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,0.8}; }; @@ -82,9 +82,9 @@ class Ares_Dynamic_Dialog idc = 2020; x = 0 * GUI_GRID_W + GUI_GRID_X; - y = 0 * GUI_GRID_H + GUI_GRID_Y; - w = 2 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + y = 0 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0.518,0.016,0,0.8}; }; class Ares_Icon: RscPicture @@ -92,10 +92,10 @@ class Ares_Dynamic_Dialog idc = 2030; style = 48; text = "\achilles\data_f_achilles\icons\icon_achilles_dialog.paa"; - x = 0.2 * GUI_GRID_W + GUI_GRID_X; - y = 0.15 * GUI_GRID_H + GUI_GRID_Y; - w = 1.6 * GUI_GRID_W; - h = 1.2 * GUI_GRID_H; + x = 0.2 * GUI_GRID_W_FIX + GUI_GRID_X; + y = 0.15 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 1.6 * GUI_GRID_W_FIX; + h = 1.2 * GUI_GRID_H_FIX; }; //////////////////////////////////////////////////////// // GUI EDITOR OUTPUT END diff --git a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogExecuteCode.hpp b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogExecuteCode.hpp index 890894d6..c52cbae5 100644 --- a/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogExecuteCode.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/dialogs/RscDialogExecuteCode.hpp @@ -17,12 +17,12 @@ class Ares_ExecuteCode_Dialog moving = 1; text = "$STR_AMAE_EXECUTE_CODE"; //--- ToDo: Localize; - x = 2 * GUI_GRID_W + GUI_GRID_X; + x = 2 * GUI_GRID_W_FIX + GUI_GRID_X; y = 0 * GUI_GRID_H + GUI_GRID_Y; - w = 38 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 40 * GUI_GRID_W - 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = TITLE_FONT_SIZE; + sizeEx = TITLE_FONT_SIZE; colorBackground[] = {0.518,0.016,0,0.8}; }; class Ares_Main_Background: IGUIBack @@ -30,31 +30,31 @@ class Ares_ExecuteCode_Dialog idc = 2000; x = 0 * GUI_GRID_W + GUI_GRID_X; - y = 1.5 * GUI_GRID_H + GUI_GRID_Y; + y = 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 40 * GUI_GRID_W; h = 22.5 * GUI_GRID_H; colorBackground[] = {0.2,0.2,0.2,0.8}; }; - class Ares_Dialog_Bottom: IGUIBack + class Ares_Dialog_Bottom_Bar: IGUIBack { idc = 2010; - x = 7 * GUI_GRID_W + GUI_GRID_X; + x = 1 * GUI_GRID_W + 6 * GUI_GRID_W_FIX + GUI_GRID_X; y = 22 * GUI_GRID_H + GUI_GRID_Y; - w = 28 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + w = 38 * GUI_GRID_W - 10 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0,0,0,0.6}; }; class Ares_Ok_Button: RscButtonMenuOK { onButtonClick = "uiNamespace setVariable ['Ares_ExecuteCode_Dialog_Result', 1]; closeDialog 1;"; idc = 3000; - x = 35.5 * GUI_GRID_W + GUI_GRID_X; + x = 39.5 * GUI_GRID_W - 4 * GUI_GRID_W_FIX + GUI_GRID_X; y = 22 * GUI_GRID_H + GUI_GRID_Y; - w = 4 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 4 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,0.8}; }; @@ -64,10 +64,10 @@ class Ares_ExecuteCode_Dialog idc = 3010; x = 0.5 * GUI_GRID_W + GUI_GRID_X; y = 22 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + w = 6 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,0.8}; }; @@ -76,11 +76,11 @@ class Ares_ExecuteCode_Dialog idc = 1010; text = "Mode:"; //--- ToDo: Localize; x = 0.5 * GUI_GRID_W + GUI_GRID_X; - y = 19.5 * GUI_GRID_H + GUI_GRID_Y; + y = 20.5 * GUI_GRID_H - 1 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 39 * GUI_GRID_W; - h = 2 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + h = 1 * GUI_GRID_H + 1 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorBackground[] = {0,0,0,0.6}; }; class Ares_Dialog_Combo: RscCombo @@ -88,11 +88,11 @@ class Ares_ExecuteCode_Dialog onLBSelChanged = "uiNamespace setVariable ['Ares_ExecuteCode_Dialog_Constraint', _this select 1];"; idc = 4000; x = 16 * GUI_GRID_W + GUI_GRID_X; - y = 20 * GUI_GRID_H + GUI_GRID_Y; + y = 21 * GUI_GRID_H - 1 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 22.5 * GUI_GRID_W; - h = 1 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + h = 1 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorBackground[] = {0,0,0,0.5}; }; class Ares_Background_Edit: IGUIBack @@ -100,9 +100,9 @@ class Ares_ExecuteCode_Dialog idc = 2020; x = 0.5 * GUI_GRID_W + GUI_GRID_X; - y = 2 * GUI_GRID_H + GUI_GRID_Y; + y = 0.5 * GUI_GRID_H + 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 39 * GUI_GRID_W; - h = 17 * GUI_GRID_H; + h = 19.5 * GUI_GRID_H - 2.5 * GUI_GRID_H_FIX; colorBackground[] = {0,0,0,0.6}; }; class Ares_Paragraph_edit: RscText @@ -111,11 +111,11 @@ class Ares_ExecuteCode_Dialog text = "$STR_AMAE_WRITE_OR_PASTE_CODE"; //--- ToDo: Localize; x = 1 * GUI_GRID_W + GUI_GRID_X; - y = 2 * GUI_GRID_H + GUI_GRID_Y; + y = 0.5 * GUI_GRID_H + 1.5 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 39 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + h = 1.5 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; }; class Ares_Edit: RscEdit { @@ -155,11 +155,11 @@ class Ares_ExecuteCode_Dialog autocomplete = "scripting"; x = 1 * GUI_GRID_W + GUI_GRID_X; - y = 3.5 * GUI_GRID_H + GUI_GRID_Y; + y = 0.5 * GUI_GRID_H + 3 * GUI_GRID_H_FIX + GUI_GRID_Y; w = 38 * GUI_GRID_W; - h = 15 * GUI_GRID_H; - size = FONT_SIZE; - sizeEx = FONT_SIZE; + h = 19 * GUI_GRID_H - 4 * GUI_GRID_H_FIX; + size = DEFAULT_FONT_SIZE; + sizeEx = DEFAULT_FONT_SIZE; colorText[] = {0.5,0.5,0.5,1}; colorBackground[] = {0,0,0,0.5}; }; @@ -167,10 +167,10 @@ class Ares_ExecuteCode_Dialog { idc = 2020; - x = 0 * GUI_GRID_W + GUI_GRID_X; - y = 0 * GUI_GRID_H + GUI_GRID_Y; - w = 2 * GUI_GRID_W; - h = 1.5 * GUI_GRID_H; + x = 0 * GUI_GRID_W_FIX + GUI_GRID_X; + y = 0 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 2 * GUI_GRID_W_FIX; + h = 1.5 * GUI_GRID_H_FIX; colorBackground[] = {0.518,0.016,0,0.8}; }; class Ares_Icon: RscPicture @@ -178,10 +178,10 @@ class Ares_ExecuteCode_Dialog idc = 2030; style = 48; text = "\achilles\data_f_achilles\icons\icon_achilles_dialog.paa"; - x = 0.2 * GUI_GRID_W + GUI_GRID_X; - y = 0.15 * GUI_GRID_H + GUI_GRID_Y; - w = 1.6 * GUI_GRID_W; - h = 1.2 * GUI_GRID_H; + x = 0.2 * GUI_GRID_W_FIX + GUI_GRID_X; + y = 0.15 * GUI_GRID_H_FIX + GUI_GRID_Y; + w = 1.6 * GUI_GRID_W_FIX; + h = 1.2 * GUI_GRID_H_FIX; }; //////////////////////////////////////////////////////// // GUI EDITOR OUTPUT END diff --git a/@AresModAchillesExpansion/addons/ui_f/functions/dynamic/fn_ShowChooseDialog.sqf b/@AresModAchillesExpansion/addons/ui_f/functions/dynamic/fn_ShowChooseDialog.sqf index 532369f2..5c8a3ec2 100644 --- a/@AresModAchillesExpansion/addons/ui_f/functions/dynamic/fn_ShowChooseDialog.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/functions/dynamic/fn_ShowChooseDialog.sqf @@ -28,13 +28,17 @@ if ((count _this) == 2 && (_choicesArray select 0) isEqualType "") then #define GUI_GRID_X (0.294 * safeZoneW + safeZoneX) #define GUI_GRID_Y (0.177 * safeZoneH + safeZoneY) #define GUI_GRID_W (0.010 * safeZoneW) +#define GUI_GRID_W_FIX (0.025) #define GUI_GRID_H (0.022 * safeZoneH) +#define GUI_GRID_H_FIX (0.04) //converts GUI grid to GUI coordinates #define GtC_X(GRID) GRID * GUI_GRID_W + GUI_GRID_X #define GtC_Y(GRID) GRID * GUI_GRID_H + GUI_GRID_Y #define GtC_W(GRID) GRID * GUI_GRID_W +#define GtC_W_FIX(GRID) GRID * GUI_GRID_W_FIX #define GtC_H(GRID) GRID * GUI_GRID_H +#define GtC_H_FIX(GRID) GRID * GUI_GRID_H_FIX #define DYNAMIC_GUI_IDD 133798 #define DYNAMIC_TITLE_IDC 1000 @@ -45,23 +49,23 @@ if ((count _this) == 2 && (_choicesArray select 0) isEqualType "") then #define BG_WIDTH (40 * GUI_GRID_W) #define START_ROW_Y (0) #define MAX_ALL_ROWS_H (29.4 * GUI_GRID_H) -#define LABEL_COMBO_H (0.5 * GUI_GRID_H) +#define LABEL_COMBO_H (0.5 * GUI_GRID_H_FIX) #define LABEL_COLUMN_X (0.5 * GUI_GRID_W) #define LABEL_WIDTH (39 * GUI_GRID_W) -#define LABEL_HEIGHT (2 * GUI_GRID_H) +#define LABEL_HEIGHT (2 * GUI_GRID_H_FIX) #define COMBO_COLUMN_X (16 * GUI_GRID_W) #define COMBO_WIDTH (22.5 * GUI_GRID_W) -#define COMBO_HEIGHT (1 * GUI_GRID_H) +#define COMBO_HEIGHT (1 * GUI_GRID_H_FIX) #define OK_BUTTON_X (29.5 * GUI_GRID_W) #define OK_BUTTON_WIDTH (4 * GUI_GRID_W) -#define OK_BUTTON_HEIGHT (1.5 * GUI_GRID_H) +#define OK_BUTTON_HEIGHT (1.5 * GUI_GRID_H_FIX) #define CANCEL_BUTTON_X (34 * GUI_GRID_W) #define CANCEL_BUTTON_WIDTH (4.5 * GUI_GRID_W) -#define CANCEL_BUTTON_HEIGHT (1.5 * GUI_GRID_H) -#define TOTAL_ROW_HEIGHT (2.1 * GUI_GRID_H) +#define CANCEL_BUTTON_HEIGHT (1.5 * GUI_GRID_H_FIX) +#define TOTAL_ROW_HEIGHT (2.1 * GUI_GRID_H_FIX) -#define FONT_SIZE (1.2 * GUI_GRID_H) +#define DEFAULT_FONT_SIZE (GUI_GRID_H_FIX) #define BASE_IDC_LABEL (10000) #define BASE_IDC_CTRL (20000) @@ -78,7 +82,7 @@ private _row_heights = _choicesArray apply _choices = _x select 1; switch (_choices) do { - case "ALLSIDE"; case "SIDE": {GtC_H(4.1)}; + case "ALLSIDE"; case "SIDE": {GtC_H_FIX(4.1)}; case "MESSAGE": {TOTAL_ROW_HEIGHT + 4*COMBO_HEIGHT}; default {TOTAL_ROW_HEIGHT}; }; @@ -93,7 +97,7 @@ _pos set [3, _tot_height]; _ctrl_group ctrlSetPosition _pos; _ctrl_group ctrlCommit 0; -private _yCoord = GUI_GRID_Y + GtC_H(1.5) + GtC_H(0.4) + _tot_height + GtC_H(0.4); +private _yCoord = GUI_GRID_Y + GtC_H_FIX(1.5) + GtC_H(0.4) + _tot_height + GtC_H(0.4); { private _bottomCtrl = _dialog displayCtrl _x; @@ -103,7 +107,7 @@ private _yCoord = GUI_GRID_Y + GtC_H(1.5) + GtC_H(0.4) + _tot_height + GtC_H(0.4 _bottomCtrl ctrlCommit 0; } forEach DYNAMIC_BOTTOM_IDCs; -_yCoord = _yCoord + TOTAL_ROW_HEIGHT; +_yCoord = _yCoord + GtC_H_FIX(1.5) + GtC_H(0.4); // Resize the background private _background = _dialog displayCtrl DYNAMIC_BG_IDC; @@ -140,7 +144,7 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", // Create the label for this entry private _choiceLabel = _dialog ctrlCreate ["RscText", BASE_IDC_LABEL + _forEachIndex, _ctrl_group]; _choiceLabel ctrlSetText _choiceName; - _choiceLabel ctrlSetFontHeight FONT_SIZE; + _choiceLabel ctrlSetFontHeight DEFAULT_FONT_SIZE; _choiceLabel ctrlSetBackgroundColor [0,0,0,0.6]; if (_choices isEqualType []) then @@ -153,7 +157,7 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", // Create the combo box for this entry and populate it. private _choiceCombo = _dialog ctrlCreate ["RscCombo", BASE_IDC_CTRL + _forEachIndex, _ctrl_group]; _choiceCombo ctrlSetPosition [COMBO_COLUMN_X, _yCoord+LABEL_COMBO_H, COMBO_WIDTH, COMBO_HEIGHT]; - _choiceCombo ctrlSetFontHeight FONT_SIZE; + _choiceCombo ctrlSetFontHeight DEFAULT_FONT_SIZE; _choiceLabel ctrlSetBackgroundColor [0,0,0,0.5]; _choiceCombo ctrlCommit 0; { @@ -190,18 +194,18 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", if (_choices in ["ALLSIDE","SIDE"]) then { // set entry label position - _choiceLabel ctrlSetPosition [GtC_W(0.5),_yCoord,GtC_W(39),GtC_H(4)]; + _choiceLabel ctrlSetPosition [GtC_W(0.5),_yCoord,GtC_W(39),GtC_H_FIX(4)]; _choiceLabel ctrlCommit 0; // create entry background private _ctrl = _dialog ctrlCreate ["RscText", BASE_IDC_CTRL + _forEachIndex, _ctrl_group]; - _yCoord = _yCoord + GtC_H(0.5); + _yCoord = _yCoord + GtC_H_FIX(0.5); _ctrl ctrlSetBackgroundColor [1,1,1,0.1]; - _ctrl ctrlSetPosition [GtC_W(8),_yCoord,GtC_W(31),GtC_H(3)]; + _ctrl ctrlSetPosition [GtC_W(8),_yCoord,GtC_W(31),GtC_H_FIX(3)]; _ctrl ctrlCommit 0; // create Active Entry Pictures - _yCoord = _yCoord + GtC_H(0.5); + _yCoord = _yCoord + GtC_H_FIX(0.5); private _xCoord = GtC_W(12.5); { private _icon = _x; @@ -211,9 +215,9 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", private _side_name = if (_foreachindex == 0) then {"ZEUS"} else {toUpper ((_foreachindex - 1) call bis_fnc_sideName)}; _ctrl ctrlSetTooltip _side_name; _ctrl ctrlSetText _icon; - _ctrl ctrlSetPosition [_xCoord,_yCoord,GtC_W(2.4),GtC_H(2)]; + _ctrl ctrlSetPosition [_xCoord,_yCoord,GtC_W_FIX(2.4),GtC_H_FIX(2)]; _ctrl ctrlCommit 0; - _xCoord = _xCoord + 4*GUI_GRID_W; + _xCoord = _xCoord + GtC_W(2.4) + GtC_W_FIX(1.6); } forEach ["\a3\Ui_F_Curator\Data\Logos\arma3_curator_eye_64_ca.paa","\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_east_ca.paa","\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_west_ca.paa","\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_guer_ca.paa","\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_civ_ca.paa"]; if (_choices == "SIDE") then @@ -230,7 +234,7 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", ["onLoad",_dialog,_forEachIndex,_defaultChoice] call Achilles_fnc_sideTab; - _yCoord = _yCoord + GtC_H(3.1); + _yCoord = _yCoord + GtC_H_FIX(3.1); } else { private _add_height = [0, 4*COMBO_HEIGHT] select (_choices == "MESSAGE"); @@ -266,7 +270,7 @@ private _titleVariableIdentifier = format ["Ares_ChooseDialog_DefaultValues_%1", _defaultChoice = ["", _defaultChoice] select (_defaultChoice isEqualType ""); _ctrl ctrlSetText _defaultChoice; - _ctrl ctrlSetFontHeight FONT_SIZE; + _ctrl ctrlSetFontHeight DEFAULT_FONT_SIZE; _ctrl ctrlSetBackgroundColor [0, 0, 0, 0]; _ctrl ctrlSetEventHandler ["KeyUp", "uiNamespace setVariable [format['Ares_ChooseDialog_ReturnValue_%1'," + str (_forEachIndex) + "], ctrlText (_this select 0)];"]; };