Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General - Tiny optimizations for config math and calls #1741

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

General - Tiny optimizations for config math and calls #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/bitwise/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<Package name="bitwise">
<Key ID="STR_CBA_bitwise_Component">
<English>Community Base Addons - Bitwise</English>
<French>Community Base Addons - Bit par bit</French>
<German>Community Base Addons - Bitweise</German>
<Japanese>Community Base Addons - ビット演算</Japanese>
<French>Community Base Addons - Bit par bit</French>
</Key>
</Package>
</Project>
10 changes: 5 additions & 5 deletions addons/diagnostic/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ class Extended_PreInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayDebugPublic {
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
// remove scripted cancel button.
GVAR(removeCancelButton) = "((_this select 0) displayCtrl 2) ctrlEnable false; ((_this select 0) displayCtrl 2) ctrlShow false;";
};
class RscDisplayInterrupt {
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
GVAR(targetDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
GVAR(targetDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
};
class RscDisplayMPInterrupt {
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
GVAR(targetDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
GVAR(targetDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
};
};
2 changes: 1 addition & 1 deletion addons/disposable/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ class Extended_PreInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayInventory {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
};
};
4 changes: 2 additions & 2 deletions addons/events/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ class Extended_PostInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMission)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMission)'));
};
class RscDiary {
ADDON = QUOTE(if (ctrlIDD (_this select 0) == 12) then {_this call (uiNamespace getVariable 'FUNC(initDisplayMainMap)')};);
};
class RscDisplayCurator {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
};
};
2 changes: 1 addition & 1 deletion addons/keybinding/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ class Extended_PreInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayConfigure {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayConfigure)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayConfigure)'));
};
};
4 changes: 2 additions & 2 deletions addons/keybinding/gui.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class GVAR(key): RscControlsGroupNoScrollbars {
class controls {
class EditButton: RscButton {
idc = IDC_KEY_EDIT;
onButtonClick = QUOTE(_this call (uiNamespace getVariable 'FUNC(gui_editKey)'));
onButtonClick = QUOTE(call (uiNamespace getVariable 'FUNC(gui_editKey)'));
onMouseEnter = "(_this select 0) ctrlSetTextColor [0,0,0,1]";
onMouseExit = "(_this select 0) ctrlSetTextColor [1,1,1,1]";
style = ST_LEFT;
Expand Down Expand Up @@ -87,7 +87,7 @@ class GVAR(subCat): RscControlsGroupNoScrollbars {
class RscDisplayConfigure {
class controls {
class CBA_ButtonConfigureAddons: RscButtonMenu {
onButtonClick = QUOTE(_this call (uiNamespace getVariable 'FUNC(gui_configure)'));
onButtonClick = QUOTE(call (uiNamespace getVariable 'FUNC(gui_configure)'));
idc = IDC_BTN_CONFIGURE_ADDONS;
text = CSTRING(configureAddons);
x = QUOTE(POS_X(20.15));
Expand Down
3 changes: 1 addition & 2 deletions addons/main/script_macros_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,7 @@ Macros: TRACE_n()
Author:
Spooner
------------------------------------------- */
#define PFORMAT_1(MESSAGE,A) \
format ['%1: A=%2', MESSAGE, RETNIL(A)]
#define PFORMAT_1(MESSAGE,A) format ['%1: A=%2', MESSAGE, RETNIL(A)]

#define PFORMAT_2(MESSAGE,A,B) \
format ['%1: A=%2, B=%3', MESSAGE, RETNIL(A), RETNIL(B)]
Expand Down
4 changes: 2 additions & 2 deletions addons/optics/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ class Extended_PreInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayInterrupt {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
};
class RscDisplayMPInterrupt {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
};
};
18 changes: 9 additions & 9 deletions addons/quicktime/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,57 @@
<Package name="Quicktime">
<Key ID="STR_cba_quicktime_Component">
<English>Community Base Addons - Quick-Time Events</English>
<French>Community Base Addons - Quick-Time-Events</French>
<German>Community Base Addons - Quick-Time-Events</German>
<Japanese>Community Base Addons - QTE(クイック タイム イベント)</Japanese>
<French>Community Base Addons - Quick-Time-Events</French>
</Key>
<Key ID="STR_cba_quicktime_QTEAccessabilitySingleKey">
<English>Single Key press</English>
<French>Appui d'une seule touche</French>
<German>Einmaliger Tastendruck</German>
<Japanese>キー押下を1回に</Japanese>
<French>Appui d'une seule touche</French>
</Key>
<Key ID="STR_cba_quicktime_QTEAccessabilitySingleKeyTooltip">
<English>When enabled, all Quick-Time Events will be shortened to a single key press.</English>
<French>Lorsqu'ils sont activés, tous les événements Quick Time ne nécessitent qu'une seule pression de touche.</French>
<German>Wenn aktiviert, benötigen alle Quick-Time-Events nur einen einzigen Tastendruck.</German>
<Japanese>有効にすると、すべてのQTEを1回のキー押下へと短縮します。</Japanese>
<French>Lorsqu'ils sont activés, tous les événements Quick Time ne nécessitent qu'une seule pression de touche.</French>
</Key>
<Key ID="STR_cba_quicktime_QTEKeybindDownTooltip">
<English>Down key used in Quick-Time Events.</English>
<French>Touche du bas utilisée dans les Quick-Time Events.</French>
<German>Taste in Quick-Time-Events für unten.</German>
<Japanese>QTEで使用される下キー。</Japanese>
<French>Touche du bas utilisée dans les Quick-Time Events.</French>
</Key>
<Key ID="STR_cba_quicktime_QTEKeybindGroup">
<English>CBA Quick-Time Events</English>
<French>Événements CBA Quick-Time</French>
<German>CBA Quick-Time-Events</German>
<Japanese>CBA QTE</Japanese>
<French>Événements CBA Quick-Time</French>
</Key>
<Key ID="STR_cba_quicktime_QTEKeybindLeftTooltip">
<English>Left key used in Quick-Time Events.</English>
<French>Touche de gauche utilisée dans les Quick-Time Events.</French>
<German>Taste in Quick-Time-Events für links.</German>
<Japanese>QTEで使用される左キー。</Japanese>
<French>Touche de gauche utilisée dans les Quick-Time Events.</French>
</Key>
<Key ID="STR_cba_quicktime_QTEKeybindRightTooltip">
<English>Right key used in Quick-Time Events.</English>
<French>Touche de droite utilisée dans les Quick-Time Events.</French>
<German>Taste in Quick-Time-Events für rechts.</German>
<Japanese>QTEで使用される右キー。</Japanese>
<French>Touche de droite utilisée dans les Quick-Time Events.</French>
</Key>
<Key ID="STR_cba_quicktime_QTEKeybindUpTooltip">
<English>Up key used in Quick-Time Events.</English>
<French>Touche du haut utilisée dans les événements Quick-Time.</French>
<German>Taste in Quick-Time-Events für oben.</German>
<Japanese>Qで使用される上キー。</Japanese>
<French>Touche du haut utilisée dans les événements Quick-Time.</French>
</Key>
<Key ID="STR_cba_quicktime_QTETitle">
<English>Quick-Time Events</English>
<French>Quick-Time-Events</French>
<German>Quick-Time-Events</German>
<Japanese>QTE</Japanese>
<French>Quick-Time-Events</French>
</Key>
</Package>
</Project>
6 changes: 3 additions & 3 deletions addons/settings/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ class Extended_PostInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayMain {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMain)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMain)'));
};
class RscDisplayGameOptions {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayGameOptions)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayGameOptions)'));
};
class Display3DEN {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplay3DEN)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplay3DEN)'));
};
};
22 changes: 11 additions & 11 deletions addons/ui/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,36 @@ class Extended_PreInit_EventHandlers {

class Extended_DisplayLoad_EventHandlers {
class RscDisplayInterrupt {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
};
class RscDisplayMPInterrupt {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
};
class RscDisplayMultiplayerSetup {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMultiplayerSetup)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMultiplayerSetup)'));
};
class RscDisplayOptionsLayout {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayOptionsLayout)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayOptionsLayout)'));
};
class RscDisplayPassword {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayPassword)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayPassword)'));
};
class RscDisplayRemoteMissions {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayRemoteMissions)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayRemoteMissions)'));
};
class RscDiary {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayDiary)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayDiary)'));
};
class Display3DEN {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplay3DEN)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplay3DEN)'));
};
class RscDisplayCurator {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
};
class RscMsgBox {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMessageBox)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMessageBox)'));
};
class RscDisplayInventory {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
};
};
28 changes: 14 additions & 14 deletions addons/ui/flexiMenu/data/menu_arma2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define _LBH_overlap 0.0375 * safeZoneH // button height with 1 pixel overlap for type "popup" menu
#define _listButtonsPerRow 10
//#define _captionColorBG 58 / 256, 80 / 256, 55 / 256 // BIS mid green (button over colour)
#define _captionColorFG "138 / 256", "146 / 256", "105 / 256" // BIS greenish text
#define _captionColorFG (138 / 256), (146 / 256), (105 / 256) //BIS greenish text
#define _captionHgt 0.85
#define _gapW 0.01 * safeZoneW // Horizontal gap "width" between circle button and side buttons
#define _gapH ((_CH / 2 - 2 * _BH) * 2 / 3) // Button "height" vertical spacing
Expand Down Expand Up @@ -123,7 +123,7 @@ class CBA_flexiMenu_rscArma2 {
};

class button01: button {
idc = QUOTE(_flexiMenu_baseIDC_button + 0);
idc = _flexiMenu_baseIDC_button + 0;
x = QUOTE(_SX - _CW / 2 + _CX_correction);
y = QUOTE(_SY - _CH / 2);
w = QUOTE(_CW);
Expand Down Expand Up @@ -153,7 +153,7 @@ class CBA_flexiMenu_rscArma2 {
animTextureNoShortcut = _imagePath(mid_button_normal); // used?
};
class button02: button {
idc = QUOTE(_flexiMenu_baseIDC_button + 1);
idc = _flexiMenu_baseIDC_button + 1;
x = QUOTE(_SX - _BW / 2);
y = QUOTE(_SY - (_CH / 2 + _gapH) - _BH);
animTextureNormal = _imagePathUI(normal_ca);
Expand All @@ -165,55 +165,55 @@ class CBA_flexiMenu_rscArma2 {
animTextureNoShortcut = _imagePathUI(normal_ca);
};
class button03: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 2);
idc = _flexiMenu_baseIDC_button + 2;
x = QUOTE(_SX - _BW / 2);
y = QUOTE(_SY + (_CH / 2 + _gapH));
};
//---------------------------------
class button04: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 3);
idc = _flexiMenu_baseIDC_button + 3;
x = QUOTE(_leftButtonLevel1X);
y = QUOTE(_SY - _gapH / 2 - _BH - _gapH - _BH);
};
class button05: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 4);
idc = _flexiMenu_baseIDC_button + 4;
x = QUOTE(_leftButtonLevel2X);
y = QUOTE(_SY - _gapH / 2 - _BH);
};
class button06: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 5);
idc = _flexiMenu_baseIDC_button + 5;
x = QUOTE(_leftButtonLevel2X);
y = QUOTE(_SY + _gapH / 2);
};
class button07: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 6);
idc = _flexiMenu_baseIDC_button + 6;
x = QUOTE(_leftButtonLevel1X);
y = QUOTE(_SY + _gapH / 2 + _BH + _gapH);
};
//---------------------------------
class button08: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 7);
idc = _flexiMenu_baseIDC_button + 7;
x = QUOTE(_rightButtonLevel1X);
y = QUOTE(_SY - _gapH / 2 - _BH - _gapH - _BH);
};
class button09: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 8);
idc = _flexiMenu_baseIDC_button + 8;
x = QUOTE(_rightButtonLevel2X);
y = QUOTE(_SY - _gapH / 2 - _BH);
};
class button10: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 9);
idc = _flexiMenu_baseIDC_button + 9;
x = QUOTE(_rightButtonLevel2X);
y = QUOTE(_SY + _gapH / 2);
};
class button11: button02 {
idc = QUOTE(_flexiMenu_baseIDC_button + 10);
idc = _flexiMenu_baseIDC_button + 10;
x = QUOTE(_rightButtonLevel1X);
y = QUOTE(_SY + _gapH / 2 + _BH + _gapH);
};
//-----------------------
class caption2: caption {
idc = QUOTE(_flexiMenu_IDC_listMenuDesc);
idc = _flexiMenu_IDC_listMenuDesc;
x = QUOTE(_SX-(_SMW/2));
y = QUOTE(_SY + (_CH/2 + _gapH) + _BH + _gapH + 0*_LBH);
w = 0; // flexiMenu_subMenuCaptionWidth; // hide initially
Expand All @@ -223,7 +223,7 @@ class CBA_flexiMenu_rscArma2 {
// Note: x pos will be 3 columns, with first column centred, 2nd on right, 3rd on left.
#define ExpandMacro_ListControls(ID)\
class listButton##ID: listButton {\
idc = QUOTE(_flexiMenu_baseIDC_listButton+ID);\
idc = _flexiMenu_baseIDC_listButton+ID;\
x = QUOTE(_SX - ((_SMW+_gapW) * 1.5) + floor (((##ID + _listButtonsPerRow) / _listButtonsPerRow) mod 3) * (_SMW + _gapW));\
y = QUOTE(_SY + (_CH / 2 + _gapH) + _BH + _gapH + (1 + (##ID mod _listButtonsPerRow)) * _LBH);\
}
Expand Down
8 changes: 4 additions & 4 deletions addons/ui/flexiMenu/data/menu_buttonList.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#define _LBH 0.033 * safeZoneH // list button height
#define _gapH 0.01 * safeZoneH
#define _buttonsBeforeCenter 7 // buttons above screen centre, allowing menu to appear centred.
#define _captionColorBG "58 / 256", "80 / 256", "55 / 256" // BIS mid green (button over colour)
#define _captionColorFG "138 / 256", "146 / 256", "105 / 256" // BIS greenish text
#define _captionColorBG (58 / 256), (80 / 256), (55 / 256) //BIS mid green (button over colour)
#define _captionColorFG (138 / 256), (146 / 256), (105 / 256) //BIS greenish text
#define _captionHgt 0.75

class CBA_flexiMenu_rscButtonList { //: _flexiMenu_rscRose
Expand Down Expand Up @@ -114,7 +114,7 @@ class CBA_flexiMenu_rscButtonList { //: _flexiMenu_rscRose

#define ExpandMacro_RowControls(ID) \
class button##ID: button {\
idc = QUOTE(_flexiMenu_baseIDC_button + ID);\
idc = _flexiMenu_baseIDC_button + ID;\
y = QUOTE(_SY-_buttonsBeforeCenter * _BH + ID * _BH);\
}

Expand Down Expand Up @@ -147,7 +147,7 @@ class CBA_flexiMenu_rscButtonList { //: _flexiMenu_rscRose
//#include "common_listControls.hpp"
#define ExpandMacro_ListControls(ID)\
class listButton##ID: listButton {\
idc = QUOTE(_flexiMenu_baseIDC_listButton + ID);\
idc = _flexiMenu_baseIDC_listButton + ID;\
x = QUOTE(_SX);\
y = QUOTE(_SY - _buttonsBeforeCenter * _BH + ID * _LBH);\
}
Expand Down
8 changes: 4 additions & 4 deletions addons/ui/flexiMenu/data/menu_iconRow.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#define _gapH 0.01 * safeZoneH
#define _buttonsBeforeCenter 6 // buttons before screen centre, allowing menu to appear centred.
#define _buttonsPerRow 5
#define _captionColorBG "58 / 256", "80 / 256", "55 / 256" // BIS mid green (button over colour)
#define _captionColorFG "138 / 256", "146 / 256", "105 / 256" // BIS greenish text
#define _captionColorBG (58 / 256), (80 / 256), (55 / 256) //BIS mid green (button over colour)
#define _captionColorFG (138 / 256), (146 / 256), (105 / 256) //BIS greenish text
#define _captionHgt 0.75

class CBA_flexiMenu_rscIconRow { //: _flexiMenu_rscRose
Expand Down Expand Up @@ -117,7 +117,7 @@ class CBA_flexiMenu_rscIconRow { //: _flexiMenu_rscRose

#define ExpandMacro_RowControls(ID)\
class button##ID: button {\
idc = QUOTE(_flexiMenu_baseIDC_button + ID);\
idc = _flexiMenu_baseIDC_button + ID;\
x = QUOTE(_SX-_buttonsBeforeCenter * _BW + (##ID mod _buttonsPerRow) * _BW);\
y = QUOTE(_SY + floor (##ID / _buttonsPerRow) * (_gapH + _BH2));\
}
Expand Down Expand Up @@ -153,7 +153,7 @@ class CBA_flexiMenu_rscIconRow { //: _flexiMenu_rscRose
//#include "common_listControls.hpp"
#define ExpandMacro_ListControls(ID)\
class listButton##ID: listButton {\
idc = QUOTE(_flexiMenu_baseIDC_listButton + ID);\
idc = _flexiMenu_baseIDC_listButton + ID;\
x = QUOTE(_SX - _buttonsBeforeCenter * _BW + (_buttonsPerRow + 1) * _BW);\
y = QUOTE(_SY + ##ID * _LBH);\
}
Expand Down
Loading