UI and IDE tweaks

assets/ide/UIThemes/dark/theme.xml

@@ -4,22 +4,22 @@
 	<uiScale>1.0</uiScale>
 
 	<uiDefaultFontName>sans</uiDefaultFontName>
-	<uiDefaultFontColor>0x161616ff</uiDefaultFontColor>
+	<uiDefaultFontColor>0xffffff80</uiDefaultFontColor>
 
-	<uiBgColor>0x494949ff</uiBgColor>
+	<uiBgColor>0x3e3e3eff</uiBgColor>
 	<uiAccentColor>0x36526aff</uiAccentColor>	
 	<uiHeaderBgColor>0x232323ff</uiHeaderBgColor>
-	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
+	<uiSmallHeaderBgColor>0x2a2a2aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
-	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiSectionFontColor>0xffffff3C</uiSectionFontColor>
 	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
-	<uiDefaultFontSize>12</uiDefaultFontSize>
-	<uiTextInputFontSize>12</uiTextInputFontSize>
+	<uiDefaultFontSize>14</uiDefaultFontSize>
+	<uiTextInputFontSize>14</uiTextInputFontSize>
 	<uiTextInputFontOffsetY>-2</uiTextInputFontOffsetY>		
-	<uiTextInputFontSizeMultiline>12</uiTextInputFontSizeMultiline>	
+	<uiTextInputFontSizeMultiline>14</uiTextInputFontSizeMultiline>	
 	<uiTreeArrowIconImage>arrowIcon.png</uiTreeArrowIconImage>
 	<uiTreeCellHeight>20</uiTreeCellHeight>
 	<uiTreeTextOffsetX>2</uiTreeTextOffsetX>
@@ -62,14 +62,14 @@
 
 	<uiButtonSkin>button.png</uiButtonSkin>
 	<uiButtonFocusedSkin>buttonFocused.png</uiButtonFocusedSkin>
-	<uiButtonFontSize>12</uiButtonFontSize>	
+	<uiButtonFontSize>14</uiButtonFontSize>	
 	<uiButtonFontColor>0xffffffff</uiButtonFontColor>
 	<uiButtonLabelOffsetX>0</uiButtonLabelOffsetX>
 	<uiButtonLabelOffsetY>4</uiButtonLabelOffsetY>	
-	<uiButtonSkinT>12</uiButtonSkinT>
-	<uiButtonSkinR>12</uiButtonSkinR>
-	<uiButtonSkinB>12</uiButtonSkinB>
-	<uiButtonSkinL>12</uiButtonSkinL>
+	<uiButtonSkinT>14</uiButtonSkinT>
+	<uiButtonSkinR>14</uiButtonSkinR>
+	<uiButtonSkinB>14</uiButtonSkinB>
+	<uiButtonSkinL>14</uiButtonSkinL>
 
 	<uiWindowSkin>windowBg.png</uiWindowSkin>
 	<uiWindowSkinT>24</uiWindowSkinT>
@@ -79,7 +79,7 @@
 	<uiWindowSkinPadding>15</uiWindowSkinPadding>		
 	<uiWindowTitleFont>sans</uiWindowTitleFont>
 	<uiWindowFontColor>0x000000c8</uiWindowFontColor>	
-	<uiWindowTitleFontSize>12</uiWindowTitleFontSize>
+	<uiWindowTitleFontSize>14</uiWindowTitleFontSize>
 	<uiWindowTitleX>15</uiWindowTitleX>	
 	<uiWindowTitleY>10</uiWindowTitleY>
 	<uiWindowTitleBarHeight>25</uiWindowTitleBarHeight>
@@ -105,14 +105,14 @@
 	<uiTreeContainerScrollBarOffset>27</uiTreeContainerScrollBarOffset>
 	
 	<uiCheckBoxFont>sans</uiCheckBoxFont>
-	<uiCheckBoxFontSize>12</uiCheckBoxFontSize>	
+	<uiCheckBoxFontSize>14</uiCheckBoxFontSize>	
 	<uiCheckBoxCheckedImage>checkboxChecked.png</uiCheckBoxCheckedImage>
 	<uiCheckBoxUncheckedImage>checkboxUnchecked.png</uiCheckBoxUncheckedImage>
 	<uiCheckBoxLabelOffsetX>4</uiCheckBoxLabelOffsetX>
 	<uiCheckBoxLabelOffsetY>3</uiCheckBoxLabelOffsetY>
 		
 	<uiComboBoxFont>sans</uiComboBoxFont>
-	<uiComboBoxFontSize>12</uiComboBoxFontSize>
+	<uiComboBoxFontSize>14</uiComboBoxFontSize>
 	<uiComboBoxDropdownImage>comboBoxDrop.png</uiComboBoxDropdownImage>
 	<uiComboBoxBgImage>comboBoxBg.png</uiComboBoxBgImage>
 	<uiComboBoxHeight>24</uiComboBoxHeight>
@@ -127,7 +127,7 @@
 
 
 	<uiMenuFont>sans</uiMenuFont>
-	<uiMenuFontSize>12</uiMenuFontSize>
+	<uiMenuFontSize>14</uiMenuFontSize>
 	<uiMenuTextOffsetX>10</uiMenuTextOffsetX>
 	<uiMenuTextOffsetY>-1</uiMenuTextOffsetY>		
 	<uiMenuPaddingX>3</uiMenuPaddingX>

include/polycode/modules/ui/PolyUIElement.h

@@ -118,7 +118,7 @@ namespace Polycode {
 	
 	class _PolyExport UILabel : public UIElement {
 		public:
-			UILabel(const String& text, int size, const String& fontName = "sans", int amode = 0);			
+			UILabel(const String& text, int size=-1, const String& fontName = "sans", int amode = 0);
 			void setText(const String& text);
 			Label *getLabel();
 			String getText();

src/ide/PolycodeIDEApp.cpp

@@ -63,6 +63,8 @@ core = new POLYCODE_CORE((PolycodeView*)view, 1100, 700,false,false, 0, 0,60, -1
 
     ResourcePool *globalPool = Services()->getResourceManager()->getGlobalPool();
     
+    CoreServices::getInstance()->getFontManager()->registerFont("sans", "Fonts/Lato-Semibold.ttf");
+    
     core->addFileSource("archive", "default.pak");
     globalPool->loadResourcesFromFolder("default", true);
   
@@ -76,8 +78,8 @@ core = new POLYCODE_CORE((PolycodeView*)view, 1100, 700,false,false, 0, 0,60, -1
     
     globalPool->loadResourcesFromFolder("Materials", true);
 			
-	CoreServices::getInstance()->getFontManager()->registerFont("section", "Fonts/RobotoCondensed-Bold.ttf");
-
+	CoreServices::getInstance()->getFontManager()->registerFont("section", "Fonts/Lato-Black.ttf");
+    
 
 	CoreServices::getInstance()->getMaterialManager()->setTextureFilteringMode(Texture::FILTERING_LINEAR);
 	

src/ide/PolycodeProps.cpp

@@ -222,9 +222,10 @@ PropSheet::PropSheet(String caption, String type) : UIElement() {
 	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiSmallHeaderBgColor"));
 	bg->setAnchorPoint(-1.0, -1.0, 0.0);
 	
-	UILabel *label = new UILabel(caption, 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 1.0;
-	addFocusChild(label);
+	SceneLabel *label = new SceneLabel(caption, 18, "section", Label::ANTIALIAS_FULL);
+    label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiSectionFontColor"));
+    label->setBlendingMode(Renderer::BLEND_MODE_NORMAL);
+	addChild(label);
 	label->setPosition(25, 3);	
 	
 	contents = new UIElement();
@@ -343,7 +344,7 @@ PropProp::PropProp(String caption, String type) : UIElement() {
 
 	suppressChangeEvent = false;
 	propType = type;
-	label = new UILabel(caption, 11);
+	label = new UILabel(caption);
 	label->setPosition(0, 5);
 	addFocusChild(label);
 	

src/modules/ui/PolyUIElement.cpp

@@ -30,6 +30,7 @@
 #include "polycode/core/PolyInputEvent.h"
 #include "polycode/core/PolyScene.h"
 #include "polycode/core/PolyCamera.h"
+#include "polycode/core/PolyLabel.h"
 
 using namespace Polycode;
 
@@ -129,7 +130,12 @@ UIMultilineLabel::~UIMultilineLabel() {
 
 UILabel::UILabel(const String& text, int size, const String& fontName, int amode) : UIElement() {
 
-	Config *conf = CoreServices::getInstance()->getConfig();	
+	Config *conf = CoreServices::getInstance()->getConfig();
+    
+    if(size == -1) {
+        size = conf->getNumericValue("Polycode", "uiDefaultFontSize");
+    }
+    
 	label = new SceneLabel(text, size, fontName, amode);
     label->setBlendingMode(Renderer::BLEND_MODE_NORMAL);
     label->positionAtBaseline = true;