Fixed default theme brightness, Color creation from hex strings, moved some IDE colors to theme config

Assets/UIThemes/default/theme.xml

@@ -2,6 +2,12 @@
 <PolyConfig>
 	<uiDefaultFontName>sans</uiDefaultFontName>
 	<uiDefaultFontColor>0xe4e0e3ab</uiDefaultFontColor>
+
+	<uiBgColor>0x322d2bff</uiBgColor>
+	<uiHeaderBgColor>0x262120ff</uiHeaderBgColor>
+	<uiSmallHeaderBgColor>0x2b2624ff</uiSmallHeaderBgColor>
+	<uiHeaderFontColor>0xe4e3e0ad</uiHeaderFontColor>
+
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiDefaultFontSize>12</uiDefaultFontSize>

Core/Contents/Include/PolyColor.h

@@ -23,7 +23,8 @@
 
 #pragma once
 #include "PolyGlobals.h"
- 
+#include "PolyString.h"
+
 namespace Polycode {
 
 	/**
@@ -125,6 +126,18 @@ namespace Polycode {
 			*/						
 			void setColorHexRGB(unsigned int hex);
 		
+			/** 
+			* Sets the color using an integer color value from a string
+			* @param hex String with hex RGBA color values.
+			*/			
+			void setColorHexFromString(String hex);
+			
+			/** 
+			* Sets the color using a 24-bit RGB integer color value  from a string
+			* @param hex String with hex RGB color values.
+			*/						
+			void setColorHexRGBFromString(String hex);
+					
 			/** 
 			* Sets the color using HSV values.
 			* @param h Hue.

Core/Contents/Include/PolyGLRenderer.h

@@ -137,7 +137,6 @@ namespace Polycode {
 		void setLineSmooth(bool val);		
 		
 		void loadIdentity();
-		void setClearColor(Number r, Number g, Number b);
 		
 		void setTexture(Texture *texture);		
 

Core/Contents/Include/PolyRenderer.h

@@ -111,7 +111,7 @@ namespace Polycode {
 		virtual void setTexture(Texture *texture) = 0;		
 		virtual void enableBackfaceCulling(bool val) = 0;
 		
-		virtual void setClearColor(Number r, Number g, Number b) = 0;
+		virtual void setClearColor(Number r, Number g, Number b);
 		virtual void setClearColor(Color color);
 		
 		virtual void setAmbientColor(Number r, Number g, Number b);

Core/Contents/Source/PolyColor.cpp

@@ -59,6 +59,14 @@ void Color::setColorHexRGB(unsigned int hex) {
 	
 }
 
+void Color::setColorHexFromString(String hex) {
+	setColorHex(strtol(hex.c_str(), 0, 16));
+}
+
+void Color::setColorHexRGBFromString(String hex) {
+	setColorHexRGB(strtol(hex.c_str(), 0, 16));
+}
+
 Color Color::blendColor(Color c2, int mode, Number amount, Color c3) {
 	Color ret;
 	Number premul = c2.a * amount;

Core/Contents/Source/PolyGLRenderer.cpp

@@ -552,16 +552,12 @@ void OpenGLRenderer::setPerspectiveMode() {
 void OpenGLRenderer::BeginRender() {
 	if(doClearBuffer) {
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+		glClearColor(clearColor.r, clearColor.g, clearColor.b, clearColor.a);
 	}
 	glLoadIdentity();
 	currentTexture = NULL;
 }
 
-void OpenGLRenderer::setClearColor(Number r, Number g, Number b) {
-	clearColor.setColor(r,g,b,1.0f);	
-	glClearColor(r,g,b,0.0f);
-}
-
 void OpenGLRenderer::translate3D(Vector3 *position) {
 	glTranslatef(position->x, position->y, position->z);
 }

Core/Contents/Source/PolyRenderer.cpp

@@ -385,6 +385,10 @@ void Renderer::setAmbientColor(Number r, Number g, Number b) {
 	ambientColor.setColor(r,g,b,1.0f);
 }
 
+void Renderer::setClearColor(Number r, Number g, Number b) {
+	clearColor.setColor(r,g,b,1.0f);	
+}
+
 void Renderer::setClearColor(Color color) {
 	setClearColor(color.r, color.g, color.b);
 }

IDE/Contents/Resources/SyntaxThemes/monokai.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <syntaxTheme useStrongHinting="false">
-	<bgColor r="34" g="32" b="31"/>
+	<bgColor r="41" g="37" b="37"/>
 	<cursorColor r="255" g="255" b="255"/>
 	<selectionColor r="51" g="50" b="54"/>
 	<lineNumberColor r="70" g="60" b="50"/>

IDE/Contents/Resources/UIThemes/default/theme.xml

@@ -2,6 +2,12 @@
 <PolyConfig>
 	<uiDefaultFontName>sans</uiDefaultFontName>
 	<uiDefaultFontColor>0xe4e0e3ab</uiDefaultFontColor>
+
+	<uiBgColor>0x322d2bff</uiBgColor>
+	<uiHeaderBgColor>0x262120ff</uiHeaderBgColor>
+	<uiSmallHeaderBgColor>0x2b2624ff</uiSmallHeaderBgColor>
+	<uiHeaderFontColor>0xe4e3e0ad</uiHeaderFontColor>
+
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiDefaultFontSize>12</uiDefaultFontSize>

IDE/Contents/Source/PolycodeConsole.cpp

@@ -94,11 +94,11 @@ BackTraceWindow::BackTraceWindow() : UIElement() {
 
 	labelBg = new ScreenShape(ScreenShape::SHAPE_RECT, 20,30);
 	labelBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	labelBg->setColorInt(34, 32, 31, 255);	
+	labelBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	addChild(labelBg);
 	
 	ScreenLabel *label = new ScreenLabel("CRASH STACK", 18, "section");
-	label->color.a = 0.4;
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(5,3);
 	

IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -30,10 +30,8 @@ SyntaxHighlightTheme *globalSyntaxTheme;
 
 PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	core = new CocoaCore(view, 900,700,false,true, 0, 0,30);	
-	core->addEventListener(this, Core::EVENT_CORE_RESIZE);	
-//	CoreServices::getInstance()->getRenderer()->setClearColor(40.0/255.0,37.0/255.0,36.0/255.0);
-	CoreServices::getInstance()->getRenderer()->setClearColor(43.0/255.0,39.0/255.0,38.0/255.0);
-//	CoreServices::getInstance()->getRenderer()->setClearColor(228.0/255.0,227.0/255.0,224.0/255.0);
+	core->addEventListener(this, Core::EVENT_CORE_RESIZE);
+	
 	
 	CoreServices::getInstance()->getRenderer()->setTextureFilteringMode(Renderer::TEX_FILTERING_NEAREST);
 				
@@ -55,6 +53,7 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 
 	CoreServices::getInstance()->getFontManager()->registerFont("section", "Fonts/Roboto-Thin.ttf");
 
+	CoreServices::getInstance()->getRenderer()->clearColor.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiBgColor"));
 
 //	CoreServices::getInstance()->getRenderer()->setTextureFilteringMode(Renderer::TEX_FILTERING_LINEAR);
 	CoreServices::getInstance()->getRenderer()->setTextureFilteringMode(Renderer::TEX_FILTERING_NEAREST);

IDE/Contents/Source/PolycodeProjectBrowser.cpp

@@ -29,10 +29,11 @@ PolycodeProjectBrowser::PolycodeProjectBrowser() : UIElement() {
 	headerBg = new ScreenShape(ScreenShape::SHAPE_RECT,10,10);
 	addChild(headerBg);
 	headerBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	headerBg->setColorInt(34, 32, 31, 255);
+	headerBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	
 	ScreenLabel *label = new ScreenLabel("PROJECT BROWSER", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
+	
 	addChild(label);
 	label->setPosition(10, 3);
 

IDE/Contents/Source/PolycodeProjectEditor.cpp

@@ -97,10 +97,11 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	headerBg = new ScreenShape(ScreenShape::SHAPE_RECT,10,10);
 	addChild(headerBg);
 	headerBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	headerBg->setColorInt(34, 32, 31, 255);
+	headerBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	
 	ScreenLabel *label = new ScreenLabel("PROJECT SETTINGS", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;	
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
+	
 	addChild(label);
 	label->setPosition(10, 3);
 

IDE/Contents/Source/PolycodeProps.cpp

@@ -33,7 +33,8 @@ PropList::PropList(String caption) : UIElement() {
 
 	bg = new ScreenShape(ScreenShape::SHAPE_RECT, 10,10);
 	bg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	bg->setColor(43.0/255.0,39.0/255.0,38.0/255.0, 1.0);
+	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiBgColor"));
+	
 	addChild(bg);
 	bg->blockMouseInput = true;
 	bg->processInputEvents = true;
@@ -42,11 +43,12 @@ PropList::PropList(String caption) : UIElement() {
 
 	bg2 = new ScreenShape(ScreenShape::SHAPE_RECT, 10,10);
 	bg2->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	bg2->setColorInt(34, 32, 31, 255);
+	bg2->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
+	
 	addChild(bg2);
 
 	ScreenLabel *label = new ScreenLabel(caption, 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(10, 3);
 
@@ -117,7 +119,7 @@ PropSheet::PropSheet(String caption, String type) : UIElement() {
 	
 	bg = new ScreenShape(ScreenShape::SHAPE_RECT, 30,30);
 	addChild(bg);
-	bg->setColorInt(34, 32, 31, 255);
+	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiSmallHeaderBgColor"));
 	bg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
 	
 	ScreenLabel *label = new ScreenLabel(caption, 18, "section", Label::ANTIALIAS_FULL);

IDE/Contents/Source/PolycodeScreenEditor.cpp

@@ -73,17 +73,17 @@ EntityTreeView::EntityTreeView(Entity *rootEntity) : UIElement() {
 	bg = new ScreenShape(ScreenShape::SHAPE_RECT,10,10);
 	addChild(bg);
 	bg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	bg->setColorInt(34, 32, 31, 255);
+	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	bg->blockMouseInput = true;
 	bg->processInputEvents = true;
 	
 	headerBg = new ScreenShape(ScreenShape::SHAPE_RECT,10,10);
 	addChild(headerBg);
 	headerBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	headerBg->setColorInt(34, 32, 31, 255);
+	headerBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	
 	ScreenLabel *label = new ScreenLabel("TREE VIEW", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(10, 3);
 	
@@ -435,7 +435,7 @@ PolycodeScreenEditorMain::PolycodeScreenEditorMain() {
 	viewOptions->blockMouseInput = true;
 			
 	viewOptionsBg = new ScreenShape(ScreenShape::SHAPE_RECT, 20,20);
-	viewOptionsBg->setColorInt(34, 32, 31, 255);
+	viewOptionsBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	viewOptionsBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
 	viewOptions->addChild(viewOptionsBg);
 	
@@ -444,7 +444,7 @@ PolycodeScreenEditorMain::PolycodeScreenEditorMain() {
 	
 
 	ScreenLabel *label = new ScreenLabel("GRID", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;		
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	viewOptions->addChild(label);
 	label->setPosition(10, 3);
 	
@@ -460,7 +460,7 @@ PolycodeScreenEditorMain::PolycodeScreenEditorMain() {
 	gridCheckBox->setPosition(115, 5);
 
 	label = new ScreenLabel("SNAP", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;		
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	viewOptions->addChild(label);
 	label->setPosition(180, 3);
 
@@ -482,14 +482,14 @@ PolycodeScreenEditorMain::PolycodeScreenEditorMain() {
 	properties->blockMouseInput = true;
 			
 	propertiesBg = new ScreenShape(ScreenShape::SHAPE_RECT, 20,20);
-	propertiesBg->setColorInt(34, 32, 31, 255);
+	propertiesBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	propertiesBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
 	properties->addChild(propertiesBg);
 	propertiesBg->blockMouseInput = true;
 	propertiesBg->processInputEvents = true;
 	
 	label = new ScreenLabel("SCREEN RATIO", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;		
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	properties->addChild(label);
 	label->setPosition(10, 3);
 	
@@ -500,7 +500,7 @@ PolycodeScreenEditorMain::PolycodeScreenEditorMain() {
 	scaleInput->addEventListener(this, UIEvent::CHANGE_EVENT);
 	
 	label = new ScreenLabel("PREVIEW ASPECT", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;		
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	properties->addChild(label);
 	label->setPosition(230, 3);
 	
@@ -524,7 +524,7 @@ PolycodeScreenEditorMain::PolycodeScreenEditorMain() {
 	aspectComboBox->setPosition(380, 2);
 			
 	label = new ScreenLabel("ZOOM", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;		
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	properties->addChild(label);
 	label->setPosition(470, 3);
 			
@@ -560,7 +560,7 @@ PolycodeScreenEditorMain::PolycodeScreenEditorMain() {
 	
 	toolPaletteBg = new ScreenShape(ScreenShape::SHAPE_RECT, 80, 20);
 	toolPaletteBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	toolPaletteBg->setColorInt(34, 32, 31, 255);
+	toolPaletteBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiSmallHeaderBgColor"));
 	toolPalette->addChild(toolPaletteBg);
 	toolPaletteBg->processInputEvents = true;
 	toolPaletteBg->blockMouseInput = true;
@@ -1971,10 +1971,10 @@ void PolycodeScreenEditorMain::setMode(int newMode) {
 void PolycodeScreenEditorMain::Resize(Number width, Number height) {
 
 
-	viewOptionsBg->setShapeSize(width+1, 30);
+	viewOptionsBg->setShapeSize(ceil(width), 30);
 	viewOptions->setPosition(0, height-30);
 
-	propertiesBg->setShapeSize(width+1, 30);
+	propertiesBg->setShapeSize(ceil(width), 30);
 	
 	toolPaletteBg->setShapeSize(100,height-60);
 			

IDE/Contents/Source/PolycodeSpriteEditor.cpp

@@ -99,7 +99,7 @@ PolycodeSpriteEditor::PolycodeSpriteEditor() : PolycodeEditor(true){
 	headerBg = new ScreenShape(ScreenShape::SHAPE_RECT,10,10);
 	addChild(headerBg);
 	headerBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	headerBg->setColorInt(34, 32, 31, 255);
+	headerBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	
 
 	propList = new PropList("SPRITE EDITOR");
@@ -127,7 +127,7 @@ PolycodeSpriteEditor::PolycodeSpriteEditor() : PolycodeEditor(true){
 	baseProps->propHeight = 180;
 	
 	ScreenLabel *label = new ScreenLabel("PREVIEW", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;
+	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(390, 36);
 			

IDE/Contents/Source/PolycodeTextEditor.cpp

@@ -417,7 +417,7 @@ void PolycodeTextEditor::Resize(int x, int y) {
 FindBar::FindBar() : UIElement() {
 	barBg = new ScreenShape(ScreenShape::SHAPE_RECT, 30,30);
 	barBg->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
-	barBg->setColorInt(24, 22, 21, 255);
+	barBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	addChild(barBg);
 	this->height = 30;