TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc cleanups related to ranges

Browse source 
gui padding is a >=0 element
guitabbookctrl.selectedPage defaults to -1
shape editor triggers derived from textrows must ensure they are actually loking aty an entry. -1 is the return value of" not found"
This commit is contained in:
AzaezelX 2025-10-07 16:31:24 -05:00
parent 191e69e589
commit bd44ee5341
6 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/containers/guiTabBookCtrl.cpp
View file

@ -120,7 +120,7 @@ void GuiTabBookCtrl::initPersistFields()
"Index of page to select on first onWake() call (-1 to disable)." ); "Index of page to select on first onWake() call (-1 to disable)." );
addProtectedFieldV( "selectedPage", TypeRangedS32, Offset( mSelectedPageNum, GuiTabBookCtrl ), addProtectedFieldV( "selectedPage", TypeRangedS32, Offset( mSelectedPageNum, GuiTabBookCtrl ),
&_setSelectedPage, &defaultProtectedGetFn, &CommonValidators::PositiveInt, &_setSelectedPage, &defaultProtectedGetFn, &CommonValidators::NegDefaultInt,
"Index of currently selected page." ); "Index of currently selected page." );
addField( "frontTabPadding", TypeS32, Offset( mFrontTabPadding, GuiTabBookCtrl ), addField( "frontTabPadding", TypeS32, Offset( mFrontTabPadding, GuiTabBookCtrl ),

2
Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui
View file

@ -80,7 +80,7 @@ $guiContent = new GuiControl(TypeMaskFieldGui) {
stackingType = "Vertical"; stackingType = "Vertical";
horizStacking = "Left to Right"; horizStacking = "Left to Right";
vertStacking = "Top to Bottom"; vertStacking = "Top to Bottom";
padding = "-2"; padding = "0";
dynamicSize = "1"; dynamicSize = "1";
dynamicNonStackExtent = "0"; dynamicNonStackExtent = "0";
dynamicPos = "0"; dynamicPos = "0";

16
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript
View file

@ -2116,8 +2116,12 @@ function ShapeEdTriggerList::removeItem( %this, %frame, %state )
%row = %this.findTextIndex( %this.getTriggerText( %frame, %state ) ); %row = %this.findTextIndex( %this.getTriggerText( %frame, %state ) );
if ( %row > 0 ) if ( %row > 0 )
{ {
eval( "ShapeEdAnimWindow-->trigger" @ %this.getRowId( %row ) @ ".delete();" ); %id = %this.getRowId( %row );
%this.removeRow( %row ); if (%id>=0)
{
eval( "ShapeEdAnimWindow-->trigger" @ %id @ ".delete();");
%this.removeRow( %row );
}
} }
} }
@ -2126,8 +2130,12 @@ function ShapeEdTriggerList::removeAll( %this )
%count = %this.rowCount(); %count = %this.rowCount();
for ( %row = %count-1; %row > 0; %row-- ) for ( %row = %count-1; %row > 0; %row-- )
{ {
eval( "ShapeEdAnimWindow-->trigger" @ %this.getRowId( %row ) @ ".delete();" ); %id = %this.getRowId( %row );
%this.removeRow( %row ); if (%id>=0)
{
eval( "ShapeEdAnimWindow-->trigger" @ %id @ ".delete();");
%this.removeRow( %row );
}
} }
} }

4
Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui
View file

@ -1375,7 +1375,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
StackingType = "Vertical"; StackingType = "Vertical";
HorizStacking = "Left to Right"; HorizStacking = "Left to Right";
VertStacking = "Top to Bottom"; VertStacking = "Top to Bottom";
Padding = "-2"; Padding = "0";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
internalName = "theVisOptionsList"; internalName = "theVisOptionsList";
Enabled = "1"; Enabled = "1";
@ -1444,7 +1444,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
StackingType = "Vertical"; StackingType = "Vertical";
HorizStacking = "Left to Right"; HorizStacking = "Left to Right";
VertStacking = "Top to Bottom"; VertStacking = "Top to Bottom";
Padding = "-2"; Padding = "0";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
internalName = "theClassVisList"; internalName = "theClassVisList";
Enabled = "1"; Enabled = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui
View file

@ -329,7 +329,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) {
StackingType = "Vertical"; StackingType = "Vertical";
HorizStacking = "Left to Right"; HorizStacking = "Left to Right";
VertStacking = "Top to Bottom"; VertStacking = "Top to Bottom";
Padding = "-2"; Padding = "0";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
internalName = "theMaterialList"; internalName = "theMaterialList";
Enabled = "1"; Enabled = "1";

4
Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui
View file

@ -116,7 +116,7 @@ $guiContent = new GuiControl(VisibilityLayerContainer, EditorGuiGroup) {
StackingType = "Vertical"; StackingType = "Vertical";
HorizStacking = "Left to Right"; HorizStacking = "Left to Right";
VertStacking = "Top to Bottom"; VertStacking = "Top to Bottom";
Padding = "-2"; Padding = "0";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
internalName = "theClassVisList"; internalName = "theClassVisList";
Enabled = "1"; Enabled = "1";
@ -185,7 +185,7 @@ $guiContent = new GuiControl(VisibilityLayerContainer, EditorGuiGroup) {
StackingType = "Vertical"; StackingType = "Vertical";
HorizStacking = "Left to Right"; HorizStacking = "Left to Right";
VertStacking = "Top to Bottom"; VertStacking = "Top to Bottom";
Padding = "-2"; Padding = "0";
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
internalName = "theClassSelList"; internalName = "theClassSelList";
Enabled = "1"; Enabled = "1";