diff --git a/Engine/source/gui/containers/guiTabBookCtrl.cpp b/Engine/source/gui/containers/guiTabBookCtrl.cpp index 68a69ac58..3b97adc7a 100644 --- a/Engine/source/gui/containers/guiTabBookCtrl.cpp +++ b/Engine/source/gui/containers/guiTabBookCtrl.cpp @@ -120,7 +120,7 @@ void GuiTabBookCtrl::initPersistFields() "Index of page to select on first onWake() call (-1 to disable)." ); addProtectedFieldV( "selectedPage", TypeRangedS32, Offset( mSelectedPageNum, GuiTabBookCtrl ), - &_setSelectedPage, &defaultProtectedGetFn, &CommonValidators::PositiveInt, + &_setSelectedPage, &defaultProtectedGetFn, &CommonValidators::NegDefaultInt, "Index of currently selected page." ); addField( "frontTabPadding", TypeS32, Offset( mFrontTabPadding, GuiTabBookCtrl ), diff --git a/Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui b/Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui index a5ce9d51b..5fe5d1c32 100644 --- a/Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui +++ b/Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui @@ -80,7 +80,7 @@ $guiContent = new GuiControl(TypeMaskFieldGui) { stackingType = "Vertical"; horizStacking = "Left to Right"; vertStacking = "Top to Bottom"; - padding = "-2"; + padding = "0"; dynamicSize = "1"; dynamicNonStackExtent = "0"; dynamicPos = "0"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript index e3ebc29d3..438c3be23 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript @@ -2116,8 +2116,12 @@ function ShapeEdTriggerList::removeItem( %this, %frame, %state ) %row = %this.findTextIndex( %this.getTriggerText( %frame, %state ) ); if ( %row > 0 ) { - eval( "ShapeEdAnimWindow-->trigger" @ %this.getRowId( %row ) @ ".delete();" ); - %this.removeRow( %row ); + %id = %this.getRowId( %row ); + if (%id>=0) + { + eval( "ShapeEdAnimWindow-->trigger" @ %id @ ".delete();"); + %this.removeRow( %row ); + } } } @@ -2126,8 +2130,12 @@ function ShapeEdTriggerList::removeAll( %this ) %count = %this.rowCount(); for ( %row = %count-1; %row > 0; %row-- ) { - eval( "ShapeEdAnimWindow-->trigger" @ %this.getRowId( %row ) @ ".delete();" ); - %this.removeRow( %row ); + %id = %this.getRowId( %row ); + if (%id>=0) + { + eval( "ShapeEdAnimWindow-->trigger" @ %id @ ".delete();"); + %this.removeRow( %row ); + } } } diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui index 8199497d8..e261713bf 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -1375,7 +1375,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { StackingType = "Vertical"; HorizStacking = "Left to Right"; VertStacking = "Top to Bottom"; - Padding = "-2"; + Padding = "0"; canSaveDynamicFields = "0"; internalName = "theVisOptionsList"; Enabled = "1"; @@ -1444,7 +1444,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { StackingType = "Vertical"; HorizStacking = "Left to Right"; VertStacking = "Top to Bottom"; - Padding = "-2"; + Padding = "0"; canSaveDynamicFields = "0"; internalName = "theClassVisList"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui index efb84b76f..0e98d6d87 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui @@ -329,7 +329,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { StackingType = "Vertical"; HorizStacking = "Left to Right"; VertStacking = "Top to Bottom"; - Padding = "-2"; + Padding = "0"; canSaveDynamicFields = "0"; internalName = "theMaterialList"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui index cff92d9ab..daded6817 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui @@ -116,7 +116,7 @@ $guiContent = new GuiControl(VisibilityLayerContainer, EditorGuiGroup) { StackingType = "Vertical"; HorizStacking = "Left to Right"; VertStacking = "Top to Bottom"; - Padding = "-2"; + Padding = "0"; canSaveDynamicFields = "0"; internalName = "theClassVisList"; Enabled = "1"; @@ -185,7 +185,7 @@ $guiContent = new GuiControl(VisibilityLayerContainer, EditorGuiGroup) { StackingType = "Vertical"; HorizStacking = "Left to Right"; VertStacking = "Top to Bottom"; - Padding = "-2"; + Padding = "0"; canSaveDynamicFields = "0"; internalName = "theClassSelList"; Enabled = "1";