Torque 4.0 Theme

Added a torque 4.0 theme and icon. Fixed a bug with tab positioning in the tabBook control.

editor/EditorCore/EditorCore.cs

@@ -26,6 +26,7 @@ function EditorCore::create( %this )
 	exec("./Themes/BaseTheme.cs");
 	exec("./Themes/LabCoatTheme.cs");
 	exec("./Themes/ForestRobeTheme.cs");
+	exec("./Themes/TorqueSuitTheme.cs");
 
 	%this.themes = new ScriptObject()
 	{

editor/EditorCore/Themes/BaseTheme.cs

@@ -30,11 +30,11 @@ function BaseTheme::init(%this)
 		%this.fontSize = 18;
 	}
 
-	%this.color1 = "10 10 10 255";
-	%this.color2 = "70 70 70 255";
-	%this.color3 = "120 120 120 255";
-	%this.color4 = "255 255 255 255";
-	%this.color5 = "255 133 0 255";
+	%this.color1 = "10 10 10 255";//Most commonly used for backgrounds
+	%this.color2 = "70 70 70 255";//Normally used for things that stand off the background but are still background
+	%this.color3 = "120 120 120 255";//Text set on background
+	%this.color4 = "255 255 255 255";//Similar to color 3 but with more contrast
+	%this.color5 = "255 133 0 255";//Flavor color that mostly is used on objects during interaction
 
 	%this.borderSize = 3;
 }
@@ -244,10 +244,10 @@ function BaseTheme::makeTabProfile(%this)
 		borderSL = 2;
 		borderNA = 2;
 
-		padding = 1;
-		paddingHL = 2;
-		paddingSL = 3;
-		paddingNA = 0;
+		padding = 5;
+		paddingHL = 6;
+		paddingSL = 7;
+		paddingNA = 5;
 
 		borderColor = "255 255 255 90";
 		borderColorHL = "255 255 255 90";
@@ -267,10 +267,10 @@ function BaseTheme::makeTabProfile(%this)
 		borderSL = 2;
 		borderNA = 2;
 
-		padding = 1;
-		paddingHL = 2;
-		paddingSL = 3;
-		paddingNA = 0;
+		padding = 5;
+		paddingHL = 6;
+		paddingSL = 7;
+		paddingNA = 5;
 
 		borderColor = "0 0 0 90";
 		borderColorHL = "0 0 0 90";
@@ -281,8 +281,8 @@ function BaseTheme::makeTabProfile(%this)
 	%tabBorderLeft = new GuiBorderProfile()
 	{
 		margin = 2;
-		marginHL = 1;
-		marginSL = 0;
+		marginHL = 2;
+		marginSL = 2;
 		marginNA = 2;
 
 		border = 2;
@@ -291,8 +291,8 @@ function BaseTheme::makeTabProfile(%this)
 		borderNA = 2;
 
 		padding = 10;
-		paddingHL = 11;
-		paddingSL = 12;
+		paddingHL = 10;
+		paddingSL = 10;
 		paddingNA = 10;
 
 		borderColor = "255 255 255 90";
@@ -304,8 +304,8 @@ function BaseTheme::makeTabProfile(%this)
 	%tabBorderRight = new GuiBorderProfile()
 	{
 		margin = 2;
-		marginHL = 1;
-		marginSL = 0;
+		marginHL = 2;
+		marginSL = 2;
 		marginNA = 2;
 
 		border = 2;
@@ -314,8 +314,8 @@ function BaseTheme::makeTabProfile(%this)
 		borderNA = 2;
 
 		padding = 10;
-		paddingHL = 11;
-		paddingSL = 12;
+		paddingHL = 10;
+		paddingSL = 10;
 		paddingNA = 10;
 
 		borderColor = "0 0 0 90";
@@ -326,10 +326,10 @@ function BaseTheme::makeTabProfile(%this)
 
 	%tabBorderBottom = new GuiBorderProfile()
 	{
-		padding = 2;
-		paddingHL = 2;
-		paddingSL = 2;
-		paddingNA = 2;
+		padding = 5;
+		paddingHL = 5;
+		paddingSL = 5;
+		paddingNA = 5;
 	};
 
 	%this.tabProfileTop = new GuiControlProfile ()
@@ -426,7 +426,7 @@ function BaseTheme::makeTabProfile(%this)
 
 	%bookBorderDefault = new GuiBorderProfile()
 	{
-		padding = 10;
+		padding = 5;
 	};
 
 	%this.tabBookProfileTop = new GuiControlProfile ()
@@ -637,6 +637,7 @@ function BaseTheme::makeConsoleProfile(%this)
 	};
 }
 
+//Positive values are brighter, negative are darker
 function BaseTheme::adjustValue(%this, %color, %percent)
 {
 	%red = getWord(%color, 0);

editor/EditorCore/Themes/ThemeManager.cs

@@ -41,9 +41,16 @@ function ThemeManager::onAdd(%this)
 		class = "ForestRobeTheme";
 	};
 
+	%torqueSuit = new ScriptObject()
+	{
+		superclass = "BaseTheme";
+		class = "TorqueSuitTheme";
+	};
+
 	%this.registerTheme(%constructionVest);
 	%this.registerTheme(%labCoat);
 	%this.registerTheme(%forestRobe);
+	%this.registerTheme(%torqueSuit);
 	%this.setTheme(0);
 }
 

editor/EditorCore/Themes/TorqueSuitTheme.cs

@@ -0,0 +1,415 @@
+function TorqueSuitTheme::init(%this)
+{
+	//fonts and font sizes
+	%this.font = "monaco";
+	%this.fontSize = 12;
+	if ($platform $= "windows")
+	{
+		%this.font = "lucida console";
+	}
+	else if ($platform $= "Android")
+	{
+		%this.font = "Droid";
+		%this.fontSize = 14;
+	}
+	else if($platform $= "ios")
+	{
+		%this.fontSize = 18;
+	}
+
+	%this.color1 = "48 0 34 255";
+	%this.color2 = "128 25 70 255";
+	%this.color3 = "166 38 70 255";
+	%this.color4 = "246 75 72 255";
+	%this.color5 = "33 191 132 255";
+
+	%this.borderSize = 4;
+}
+
+function TorqueSuitTheme::makeButtonProfile(%this)
+{
+	%buttonBorder = new GuiBorderProfile()
+	{
+		padding = 6;
+		paddingHL = 6;
+		paddingSL = 6;
+		paddingNA = 6;
+	};
+
+	%this.buttonProfile = new GuiControlProfile()
+	{
+		fillColor = %this.color2;
+		fillColorHL = %this.adjustValue(%this.color2, 10);
+		fillColorSL = %this.adjustValue(%this.color2, -20);
+		fillColorNA = %this.setAlpha(%this.color2, 80);
+
+		fontType = %this.font;
+		fontSize = %this.fontSize + 2;
+		fontColor = %this.color4;
+		fontColorHL = %this.adjustValue(%this.color4, 10);
+		fontColorSL = "255 255 255 150";
+		fontColorNA = %this.setAlpha(%this.color4, 100);
+		align = Center;
+
+		borderDefault = %buttonBorder;
+	};
+}
+
+function TorqueSuitTheme::makeTabProfile(%this)
+{
+	%tabBorderTop = new GuiBorderProfile()
+	{
+		margin = 2;
+		marginHL = 1;
+		marginSL = 0;
+		marginNA = 2;
+
+		border = 3;
+		borderHL = 4;
+		borderSL = 5;
+		borderNA = 3;
+
+		padding = 8;
+		paddingHL = 8;
+		paddingSL = 8;
+		paddingNA = 8;
+
+		borderColor = "255 255 255 20";
+		borderColorHL = %this.adjustValue(%this.color5, -10);
+		borderColorSL = %this.color5;
+		borderColorNA = "255 255 255 20";
+	};
+
+	%tabBorderSide = new GuiBorderProfile()
+	{
+		margin = 2;
+		marginHL = 1;
+		marginSL = 0;
+		marginNA = 2;
+
+		padding = 10;
+		paddingHL = 11;
+		paddingSL = 12;
+		paddingNA = 10;
+	};
+
+	%tabBorderBottom = new GuiBorderProfile()
+	{
+		padding = 6;
+		paddingHL = 6;
+		paddingSL = 6;
+		paddingNA = 6;
+	};
+
+	%this.tabProfileTop = new GuiControlProfile ()
+	{
+		fillColor = %this.color3;
+		fillColorHL = %this.adjustValue(%this.color3, 10);
+		fillColorSL = %this.color4;
+		fillColorNA = %this.color2;
+
+		fontType = %this.font;
+		fontSize = %this.fontSize + 2;
+		fontColor = %this.color4;
+		fontColorHL = %this.adjustValue(%this.color4, 10);
+		fontColorSL = %this.color1;
+		fontColorNA = %this.setAlpha(%this.color4, 100);
+		align = Center;
+
+		borderTop = %tabBorderTop;
+		borderLeft = %tabBorderSide;
+		borderRight = %tabBorderSide;
+		borderBottom = %tabBorderBottom;
+	};
+
+	%this.tabProfileBottom = new GuiControlProfile ()
+	{
+		fillColor = %this.color3;
+		fillColorHL = %this.adjustValue(%this.color3, 10);
+		fillColorSL = %this.color4;
+		fillColorNA = %this.color2;
+
+		fontType = %this.font;
+		fontSize = %this.fontSize + 2;
+		fontColor = %this.color4;
+		fontColorHL = %this.adjustValue(%this.color4, 10);
+		fontColorSL = %this.color1;
+		fontColorNA = %this.setAlpha(%this.color4, 100);
+		align = Center;
+
+		borderTop = %tabBorderBottom;
+		borderLeft = %tabBorderSide;
+		borderRight = %tabBorderSide;
+		borderBottom = %tabBorderTop;
+	};
+
+	%this.tabProfileLeft = new GuiControlProfile ()
+	{
+		fillColor = %this.color3;
+		fillColorHL = %this.adjustValue(%this.color3, 10);
+		fillColorSL = %this.color4;
+		fillColorNA = %this.color2;
+
+		fontType = %this.font;
+		fontSize = %this.fontSize + 2;
+		fontColor = %this.color4;
+		fontColorHL = %this.adjustValue(%this.color4, 10);
+		fontColorSL = %this.color1;
+		fontColorNA = %this.setAlpha(%this.color4, 100);
+		align = Center;
+
+		borderTop = %tabBorderSide;
+		borderLeft = %tabBorderTop;
+		borderRight = %tabBorderBottom;
+		borderBottom = %tabBorderSide;
+	};
+
+	%this.tabProfileRight = new GuiControlProfile ()
+	{
+		fillColor = %this.color3;
+		fillColorHL = %this.adjustValue(%this.color3, 10);
+		fillColorSL = %this.color4;
+		fillColorNA = %this.color2;
+
+		fontType = %this.font;
+		fontSize = %this.fontSize + 2;
+		fontColor = %this.color4;
+		fontColorHL = %this.adjustValue(%this.color4, 10);
+		fontColorSL = %this.color1;
+		fontColorNA = %this.setAlpha(%this.color4, 100);
+		align = Center;
+
+		borderTop = %tabBorderSide;
+		borderLeft = %tabBorderBottom;
+		borderRight = %tabBorderTop;
+		borderBottom = %tabBorderSide;
+	};
+
+	%bookBorderBottom = new GuiBorderProfile()
+	{
+		margin = 0;
+		border = 1;
+		borderColor = "0 0 0 150";
+		padding = 0;
+	};
+
+	%bookBorderDefault = new GuiBorderProfile()
+	{
+		padding = 6;
+	};
+
+	%bookBorderSide = new GuiBorderProfile()
+	{
+		padding = 5;
+	};
+
+	%this.tabBookProfileTop = new GuiControlProfile ()
+	{
+		borderDefault = %bookBorderDefault;
+		borderLeft = %bookBorderSide;
+		borderRight = %bookBorderSide;
+		borderBottom = %bookBorderBottom;
+		fillcolor = %this.color2;
+	};
+
+	%this.tabBookProfileBottom = new GuiControlProfile ()
+	{
+		borderDefault = %bookBorderDefault;
+		borderLeft = %bookBorderSide;
+		borderRight = %bookBorderSide;
+		borderTop = %bookBorderBottom;
+		fillcolor = %this.color2;
+	};
+
+	%this.tabBookProfileLeft = new GuiControlProfile ()
+	{
+		borderDefault = %bookBorderDefault;
+		borderTop = %bookBorderSide;
+		borderBottom = %bookBorderSide;
+		borderRight = %bookBorderBottom;
+		fillcolor = %this.color2;
+	};
+
+	%this.tabBookProfileRight = new GuiControlProfile ()
+	{
+		borderDefault = %bookBorderDefault;
+		borderTop = %bookBorderSide;
+		borderBottom = %bookBorderSide;
+		borderLeft = %bookBorderBottom;
+		fillcolor = %this.color2;
+	};
+
+	%this.tabPageProfile = new GuiControlProfile ()
+	{
+	    fillColor = %this.setAlpha(%this.color1, 150);
+	};
+}
+
+function TorqueSuitTheme::makeTextEditProfile(%this)
+{
+	//border for text boxes never use the HL state.
+	%textBorderV = new GuiBorderProfile()
+	{
+		padding = 3;
+		paddingHL = 3;
+		paddingSL = 3;
+		paddingNA = 3;
+
+		border = 1;
+		borderHL = 1;
+		borderSL = 1;
+		borderNA = 1;
+
+		borderColor = %this.color2;
+		borderColorHL = %this.adjustValue(%this.color2, 10);
+		borderColorSL = %this.color2;
+		borderColorNA = %this.adjustValue(%this.color1, 10);
+	};
+
+	%textBorderLeft = new GuiBorderProfile()
+	{
+		padding = 10;
+		paddingHL = 10 - (%this.borderSize - 1);
+		paddingSL = 10 - (%this.borderSize - 1);
+		paddingNA = 10;
+
+		border = 1;
+		borderHL = %this.borderSize;
+		borderSL = %this.borderSize;
+		borderNA = 1;
+
+		borderColor = %this.color2;
+		borderColorHL = %this.adjustValue(%this.color5, -10);
+		borderColorSL = %this.color5;
+		borderColorNA = %this.adjustValue(%this.color1, 10);
+	};
+
+	%textBorderRight = new GuiBorderProfile()
+	{
+		padding = 10;
+		paddingHL = 10;
+		paddingSL = 10;
+		paddingNA = 10;
+
+		border = 1;
+		borderHL = 1;
+		borderSL = 1;
+		borderNA = 1;
+
+		borderColor = %this.color2;
+		borderColorHL = %this.adjustValue(%this.color2, 10);
+		borderColorSL = %this.color2;
+		borderColorNA = %this.adjustValue(%this.color1, 10);
+	};
+
+	%this.textEditProfile = new GuiControlProfile()
+	{
+		fillColor = %this.color1;
+		fillColorHL = %this.adjustValue(%this.color1, 20);//used for selected text
+		fillColorSL = %this.color1;
+		fillColorNA = %this.setAlpha(%this.color1, 80);
+
+		fontType = %this.font;
+		fontSize = %this.fontSize + 2;
+		fontColor = %this.setAlpha(%this.color4, 220);
+		fontColorHL = %this.adjustValue(%this.color4, 10);
+		fontColorSL = %this.color4;
+		fontColorNA = %this.setAlpha(%this.color4, 100);
+		align = left;
+		cursorColor = %this.color5;
+
+		borderDefault = %textBorderV;
+		borderRight = %textBorderRight;
+		borderLeft = %textBorderLeft;
+
+		tab = false;
+		canKeyFocus = true;
+		returnTab = true;
+	};
+}
+
+function TorqueSuitTheme::makeScrollProfile(%this)
+{
+	%trackBorder = new GuiBorderProfile()
+	{
+		margin = 0;
+		padding = 0;
+		border = 0;
+	};
+
+	%this.trackProfile = new GuiControlProfile()
+	{
+			fillColor = %this.setAlpha(%this.color2, 150);
+			fillColorHL = %this.setAlpha(%this.color2, 100);
+			fillColorSL = %this.setAlpha(%this.adjustValue(%this.color2, 10), 150);
+			fillColorNA = %this.setAlpha(%this.color2, 50);
+			borderDefault = %trackBorder;
+	};
+
+	%thumbBorder = new GuiBorderProfile()
+	{
+		margin = 3;
+		marginHL = 3;
+		marginSL = 3;
+		marginNA = 3;
+	};
+
+	%this.thumbProfile = new GuiControlProfile()
+	{
+		fillColor = %this.color3;
+		fillColorHL = %this.adjustValue(%this.color3, 10);
+		fillColorSL = %this.color5;
+		fillColorNA = %this.setAlpha(%this.color3, 80);
+
+		borderDefault = %thumbBorder;
+	};
+
+	%arrowBorder = new GuiBorderProfile()
+	{
+		padding = 3;
+		paddingHL = 3;
+		paddingSL = 3;
+		paddingNA = 3;
+	};
+
+	%this.scrollArrowProfile = new GuiControlProfile()
+	{
+		fillColor = %this.color3;
+		fillColorHL = %this.adjustValue(%this.color3, 10);
+		fillColorSL = %this.color5;
+		fillColorNA = %this.setAlpha(%this.color3, 80);
+
+		fontType = %this.font;
+		fontColor = %this.color2;
+		fontColorHL = %this.color2;
+		fontColorSL = %this.adjustValue(%this.color5, -20);
+		fontColorNA = %this.setAlpha(%this.color2, 80);
+
+		borderDefault = %arrowBorder;
+	};
+
+	%mainBorder = new GuiBorderProfile()
+	{
+		margin = 0;
+		padding = 8;
+		border = 0;
+	};
+	%this.scrollProfile = new GuiControlProfile()
+	{
+		opaque = true;
+		fillColor = %this.setAlpha(%this.color1, 240);
+
+		borderDefault = %mainBorder;
+	};
+}
+
+function TorqueSuitTheme::makeConsoleProfile(%this)
+{
+	%this.consoleProfile = new GuiControlProfile()
+	{
+		fontType = %this.font;
+		fontColor = %this.color4; //Normal text
+		fontColorHL = %this.setAlpha(%this.color4, 140); //Warnings
+		fontColorNA = %this.color5; //Errors
+	};
+}

engine/compilers/VisualStudio 2017/Torque 2D.rc

@@ -1,6 +1,6 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
-#include "../../Source/game/resource.h"
+#include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -13,13 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -28,7 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_TORQUE2D               ICON    DISCARDABLE     "Torque 2D.ico"
+IDI_TORQUE2D            ICON                    "Torque 2D.ico"
+
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -36,18 +35,18 @@ IDI_TORQUE2D               ICON    DISCARDABLE     "Torque 2D.ico"
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -78,13 +77,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "GarageGames LLC"
+            VALUE "CompanyName", "Torque Game Engines"
             VALUE "FileDescription", "Torque 2D MIT"
             VALUE "FileVersion", "4, 0, 0, 0"
             VALUE "InternalName", "Torque 2D"
-            VALUE "LegalCopyright", "Copyright (c) 2019 GarageGames, LLC"
+            VALUE "LegalCopyright", "Copyright (c) 2020 Torque Game Engines"
             VALUE "OriginalFilename", "Torque2D.exe"
-            VALUE "ProductName", "Torque 2D MIT"
+            VALUE "ProductName", "Torque 2D"
             VALUE "ProductVersion", "4, 0, 0, 0"
         END
     END
@@ -93,7 +92,8 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
-#endif    // English (U.S.) resources
+
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

engine/compilers/VisualStudio 2017/Torque 2D.vcxproj

@@ -1234,6 +1234,7 @@
     <ClInclude Include="..\..\source\testing\unitTesting.h" />
     <ClInclude Include="..\..\source\testing\unitTesting_ScriptBinding.h" />
     <ClInclude Include="..\..\source\torqueConfig.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\source\math\mMath_ASM.asm">
@@ -1299,6 +1300,9 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="Torque 2D.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

engine/compilers/VisualStudio 2017/Torque 2D.vcxproj.filters

@@ -3153,6 +3153,7 @@
     <ClInclude Include="..\..\source\gui\containers\guiTabBookCtrl_ScriptBinding.h">
       <Filter>gui\containers</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\source\math\mMath_ASM.asm">
@@ -3171,4 +3172,7 @@
   <ItemGroup>
     <ResourceCompile Include="Torque 2D.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="Torque 2D.ico" />
+  </ItemGroup>
 </Project>

engine/compilers/VisualStudio 2017/resource.h

@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Torque 2D.rc
+//
+#define IDI_TORQUE2D                    107
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        108
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

engine/source/gui/containers/guiTabBookCtrl.cc

@@ -550,7 +550,7 @@ void GuiTabBookCtrl::calculatePageTabs()
    S32 currY      = 0;
    S32 tabHeight  = 0;
    RectI innerRect = getInnerRect(mBounds.point, mBounds.extent, NormalState, mProfile);
-   Point2I fontBasedBounds = getOuterExtent(Point2I(mTabProfile->mFont->getHeight(), mTabProfile->mFont->getHeight()), NormalState, mProfile);
+   Point2I fontBasedBounds = getOuterExtent(Point2I(mTabProfile->mFont->getHeight(), mTabProfile->mFont->getHeight()), NormalState, mTabProfile);
 
    if (mTabPosition == AlignTop || mTabPosition == AlignBottom)
    {