More UI visual tweaks

IDE/Contents/Include/PolycodeProjectEditor.h

@@ -40,6 +40,8 @@ class PolycodeProjectEditor : public PolycodeEditor {
 	
 	protected:
 	
+	ScreenImage *grid;
+
 	Object configFile;	
 	
 	std::vector<UICheckBox*> moduleCheckboxes;

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

@@ -91,10 +91,10 @@
 	<uiComboBoxFontSize>11</uiComboBoxFontSize>
 	<uiComboBoxDropdownImage>combobox_drop.png</uiComboBoxDropdownImage>
 	<uiComboBoxBgImage>combobox_bg.png</uiComboBoxBgImage>
-	<uiComboBoxBgT>3</uiComboBoxBgT>
-	<uiComboBoxBgR>3</uiComboBoxBgR>
-	<uiComboBoxBgB>3</uiComboBoxBgB>
-	<uiComboBoxBgL>3</uiComboBoxBgL>				
+	<uiComboBoxBgT>6</uiComboBoxBgT>
+	<uiComboBoxBgR>6</uiComboBoxBgR>
+	<uiComboBoxBgB>6</uiComboBoxBgB>
+	<uiComboBoxBgL>6</uiComboBoxBgL>				
 	<uiComboBoxItemsBgImage>combobox_items.png</uiComboBoxItemsBgImage>	
 	<uiComboBoxDropdownBgT>3</uiComboBoxDropdownBgT>
 	<uiComboBoxDropdownBgR>3</uiComboBoxDropdownBgR>
@@ -109,12 +109,12 @@
 	<uiComboBoxTextOffsetY>3</uiComboBoxTextOffsetY>		
 
 	<uiColorBoxFrameImage>colorboxFrame.png</uiColorBoxFrameImage>
-	<uiColorBoxFrameImageT>3</uiColorBoxFrameImageT>
-	<uiColorBoxFrameImageR>3</uiColorBoxFrameImageR>
-	<uiColorBoxFrameImageB>3</uiColorBoxFrameImageB>
-	<uiColorBoxFrameImageL>3</uiColorBoxFrameImageL>					
+	<uiColorBoxFrameImageT>7</uiColorBoxFrameImageT>
+	<uiColorBoxFrameImageR>7</uiColorBoxFrameImageR>
+	<uiColorBoxFrameImageB>7</uiColorBoxFrameImageB>
+	<uiColorBoxFrameImageL>7</uiColorBoxFrameImageL>					
 	<uiColorBoxBgImage>colorboxBg.png</uiColorBoxBgImage>
-	<uiFrameInset>1</uiFrameInset>
+	<uiColorBoxFrameInset>2</uiColorBoxFrameInset>
 
 	<uiColorPickerMainBg>colorPickerMainBg.png</uiColorPickerMainBg>
 	<uiColorPickerMainFrame>colorPickerMainFrame.png</uiColorPickerMainFrame>

IDE/Contents/Source/PolycodeProjectEditor.cpp

@@ -25,6 +25,15 @@
 
 PolycodeProjectEditor::PolycodeProjectEditor() : PolycodeEditor(true){
 
+	grid = new ScreenImage("editorGrid.png");
+	
+	addChild(grid);
+	grid->snapToPixels = true;
+	
+	grid->getTexture()->clamp = false;
+	grid->getTexture()->recreateFromImageData();	
+	
+
 	Config *conf = CoreServices::getInstance()->getConfig();	
 	String fontName = conf->getStringValue("Polycode", "uiDefaultFontName");
 	int fontSize = conf->getNumericValue("Polycode", "uiDefaultFontSize");	
@@ -235,6 +244,7 @@ bool PolycodeProjectEditor::openFile(String filePath) {
 }
 
 void PolycodeProjectEditor::Resize(int x, int y) {
+	grid->setImageCoordinates(0,0,x,y);	
 }
 
 void PolycodeProjectEditor::saveFile() {

Modules/Contents/UI/Include/PolyUIButton.h

@@ -33,7 +33,7 @@ namespace Polycode {
 
 	class _PolyExport UIButton : public UIElement {
 		public:
-			UIButton(String text, Number width, Number height = 26);
+			UIButton(String text, Number width, Number height = 28);
 			~UIButton();		
 			void handleEvent(Event *event);
 			

Modules/Contents/UI/Include/PolyUITextInput.h

@@ -80,6 +80,9 @@ namespace Polycode {
 			void Cut();
 			void Copy();
 			void Paste();
+			
+			void showLine(unsigned int lineNumber, bool top);
+
 					
 			void Resize(Number width, Number height);
 			

Modules/Contents/UI/Source/PolyUIColorBox.cpp

@@ -374,7 +374,7 @@ UIColorBox::UIColorBox(Color initialColor, Number width, Number height) : UIElem
 
 	String frameImageFile = conf->getStringValue("Polycode", "uiColorBoxFrameImage");
 	String bgImageFile = conf->getStringValue("Polycode", "uiColorBoxBgImage");
-	Number frameInset = conf->getNumericValue("Polycode", "uiFrameInset");
+	Number frameInset = conf->getNumericValue("Polycode", "uiColorBoxFrameInset");
 
 	Number st = conf->getNumericValue("Polycode", "uiColorBoxFrameImageT");
 	Number sr = conf->getNumericValue("Polycode", "uiColorBoxFrameImageR");
@@ -385,6 +385,7 @@ UIColorBox::UIColorBox(Color initialColor, Number width, Number height) : UIElem
 	bgImage = new ScreenShape(ScreenShape::SHAPE_RECT, width-(frameInset*2), height-(frameInset*2));
 	bgImage->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
 	bgImage->loadTexture(bgImageFile);
+	bgImage->setPosition(frameInset, frameInset);	
 	addChild(bgImage);
 
 	bgImage->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
@@ -392,6 +393,7 @@ UIColorBox::UIColorBox(Color initialColor, Number width, Number height) : UIElem
 
 	colorShape = new ScreenShape(ScreenShape::SHAPE_RECT, width-(frameInset*2), height-(frameInset*2));
 	colorShape->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
+	colorShape->setPosition(frameInset, frameInset);
 	addChild(colorShape);
 
 		

Modules/Contents/UI/Source/PolyUITextInput.cpp

@@ -691,6 +691,10 @@ void UITextInput::Paste() {
 	insertText(CoreServices::getInstance()->getCore()->getClipboardString());
 }
 
+void UITextInput::showLine(unsigned int lineNumber, bool top) {
+	
+}
+
 void UITextInput::onKeyDown(PolyKEY key, wchar_t charCode) {
 	
 	if(!hasFocus)