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

Jump to bottom

DartRuffian-bug/updating-base-class #340

Merged
merged 2 commits into from
Sep 17, 2024
Merged

DartRuffian-bug/updating-base-class #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efc7b15
Merge branch 'bug/updating-base-class' of https://github.com/DartRuff…
R3voA3 Sep 17, 2024
ef2e53b
Merge branch 'master' into DartRuffian-bug/updating-base-class
R3voA3 Sep 17, 2024
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
43 changes: 37 additions & 6 deletions addons/main/cfg3DEN.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,33 @@ class Cfg3DEN
class Title;
};
};
//Increase height of edit attribute controls
class Edit: Title
{
class Controls;
class Controls: Controls
{
class Title;
class Value;
};
};
class EditMulti3: Edit
{
class Controls: Controls
{
class Value: Value
{
h = QUOTE(20 * 3.5 * GRID_H - 1 * GRID_H);
};
class Background: ctrlStaticOverlay
{
h = QUOTE((20 * 3.5 + 0.6 * 5) * GRID_H);
};
class Title: ctrlStaticFrame
{
h = QUOTE((20 * 3.5 + 1 * 5) * GRID_H);
};
};
};
class EditMulti5: EditMulti3
{
class Controls: Controls
{
Expand All @@ -84,14 +105,24 @@ class Cfg3DEN
};
class EditCodeMulti3: EditMulti3
{
h = QUOTE((5 + 20 * 3.5) * GRID_H);
class Controls: Controls
{
class Value;
class Background;
class Title;
class Background: Background
{
h = QUOTE((20 * 3.5 + 0.6 * 5) * GRID_H);
};
class Value: Value
{
h = QUOTE(20 * 3.5 * GRID_H - 1 * GRID_H);
};
class Title: Title
{
h = QUOTE((20 * 3.5 + 1 * 5) * GRID_H);
};
};
};
class EditMulti5: EditMulti3
class EditCodeMulti5: EditMulti5
{
h = QUOTE((5 + 20 * 3.5) * GRID_H);
class Controls: Controls
Expand Down
44 changes: 23 additions & 21 deletions addons/main/display3DEN/display3DEN.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,41 @@ class Display3DEN
idc = -1;
type = CT_BUTTON;
text = "V";
font = "PuristaLight";

type = CT_BUTTON;
x = QUOTE(ORIGIN_X_STATUSBAR - 15 * GRID_W - SPACE_X);
y = QUOTE(2 * pixelH);
w = QUOTE(4 * GRID_W - 4 * pixelW);
h = QUOTE(4 * GRID_H - 4 * pixelH);
sizeEx = QUOTE(4.32 * SIZEEX_BASE);
offsetX = 0;
offsetY = 0;
offsetPressedX = "pixelW";
offsetPressedY = "pixelH";

onLoad = "_this # 0 ctrlSetToolTip format ['%1.%2', (productVersion select 2) * 0.01 toFixed 2, productVersion select 3]";
onButtonClick = "call ENH_fnc_productInfo";
colorBackground[] = {0, 0, 0, 0.5};
style = QUOTE(ST_CENTER + ST_UPPERCASE);
colorBackgroundDisabled[] = {0, 0, 0, 0.5};
colorBackgroundActive[] = {COLOR_ACTIVE_RGB, 1};
colorBorder[] = {0, 0, 0, 0};
colorBackgroundActive[] = {COLOR_ACTIVE_RGBA};
colorFocused[] = {COLOR_ACTIVE_RGBA};
colorText[] = {1, 1, 1, 1};
colorDisabled[] = {1, 1, 1, 0.25};
colorFocused[] = {COLOR_ACTIVE_RGB, 1};
colorShadow[] = {0, 0, 0, 0};

onLoad = "_this # 0 ctrlSetToolTip format ['%1.%2', (productVersion select 2) * 0.01 toFixed 2, productVersion select 3]";
onButtonClick = "call ENH_fnc_productInfo";
soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick", 0.09, 1};
soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter", 0.09, 1};
soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape", 0.09, 1};
soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush", 0.09, 1};

borderSize = 0;
colorBorder[] = {0, 0, 0, 0};
colorShadow[] = {0, 0, 0, 0};
offsetX = 0;
offsetY = 0;
offsetPressedX = "pixelW";
offsetPressedY = "pixelH";
period = 0;
periodFocus = 2;
periodOver = 0.5;
style = "0x02 + 0xC0";
soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick", 0.09, 1};
soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter", 0.09, 1};
soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush", 0.09, 1};
soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape", 0.09, 1};
shadow = 1;
blinkingPeriod = 0;
tooltip = "";
tooltipMaxWidth = 0.5;
tooltipColorShade[] = {0, 0, 0, 1};
tooltipColorText[] = {1, 1, 1, 1};
tooltipColorBox[] = {0, 0, 0, 0};
};
class TextY: TextX
{
Expand Down